diff --git a/ChangeLog b/ChangeLog
index 13b0e5ff2..19c26765a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-08  Anders Carlsson  <andersca@gnu.org>
+
+	* src/fixedtip.c (meta_fixed_tip_show): 
+	#ifdef out call to gtk_window_set_screen, reported by
+	Erwann Chenede.
+	
 2002-05-08  Anders Carlsson  <andersca@gnu.org>
 
 	* configure.in:
diff --git a/src/fixedtip.c b/src/fixedtip.c
index 690576b52..c9af6d02d 100644
--- a/src/fixedtip.c
+++ b/src/fixedtip.c
@@ -43,9 +43,11 @@ meta_fixed_tip_show (Display *xdisplay, int screen_number,
   if (tip == NULL)
     {
       tip = gtk_window_new (GTK_WINDOW_POPUP);
+#ifdef HAVE_GTK_MULTIHEAD
       gtk_window_set_screen (GTK_WINDOW (tip),
 			     gdk_display_get_screen (gdk_get_default_display (),
 						     screen_number));
+#endif
       gtk_widget_set_app_paintable (tip, TRUE);
       gtk_window_set_policy (GTK_WINDOW (tip), FALSE, FALSE, TRUE);
       gtk_widget_set_name (tip, "gtk-tooltips");