diff --git a/ChangeLog b/ChangeLog
index 06a74aaad1..8ed3f27e19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-21  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkscalebutton.c (gtk_scale_popup): Make it work better with
+	multiple monitors.
+
 2007-05-20  Attilio Fiandrotti  <attilio.fiandrotti@gmail.com>
 
         * gdk/directfb/gdkwindow-directfb.c:
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index 307a253df1..1ac3db438e 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -694,8 +694,8 @@ gtk_scale_popup (GtkWidget *widget,
 
       d = GTK_WIDGET (priv->dock);
       monitor = gdk_screen_get_monitor_at_point (screen,
-						 button_event->x,
-						 button_event->y);
+						 button_event->x_root,
+						 button_event->y_root);
       gdk_screen_get_monitor_geometry (screen, monitor, &rect);
 
       y += button_event->y;
@@ -706,7 +706,7 @@ gtk_scale_popup (GtkWidget *widget,
 
       if (x < rect.x)
 	x = rect.x;
-      else if (x + d->allocation.width > rect.width - rect.x)
+      else if (x + d->allocation.width > rect.width + rect.x)
 	x = rect.x + rect.width - d->allocation.width;
     }