diff --git a/ChangeLog b/ChangeLog
index 95c86a2c38..ee2939f5dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* Merge from trunk:
+
+	* gtk/gtkrange.c (range_grab_remove): Queue a redraw when the
+	grab changes.  (#396470, Benjamin Berg)
+
 2007-01-15  Emmanuele Bassi  <ebassi@gnome.org>
 
 	Backport from trunk.
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index cdc652a16e..6b080dbf9e 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1418,12 +1418,16 @@ range_grab_add (GtkRange      *range,
 static void
 range_grab_remove (GtkRange *range)
 {
+  MouseLocation location;
+
   gtk_grab_remove (GTK_WIDGET (range));
-  
+ 
+  location = range->layout->grab_location; 
   range->layout->grab_location = MOUSE_OUTSIDE;
   range->layout->grab_button = 0;
 
-  if (gtk_range_update_mouse_location (range))
+  if (gtk_range_update_mouse_location (range) ||
+      location != MOUSE_OUTSIDE)
     gtk_widget_queue_draw (GTK_WIDGET (range));
 }