diff --git a/ChangeLog b/ChangeLog
index b985aaf854..c8f9ace197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-02  Kristian Rietveld  <kris@imendio.com>
+
+	Merge from trunk:
+
+	* gtk/gtktreeview.c (gtk_tree_view_grab_notify): stop the rubber band
+	if it's active.
+
 2007-05-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* NEWS: Updates
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 9a6b980a3d..7f7825d024 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -14565,7 +14565,12 @@ gtk_tree_view_grab_notify (GtkWidget *widget,
   tree_view->priv->in_grab = !was_grabbed;
 
   if (!was_grabbed)
-    tree_view->priv->pressed_button = -1;
+    {
+      tree_view->priv->pressed_button = -1;
+
+      if (tree_view->priv->rubber_band_status)
+	gtk_tree_view_stop_rubber_band (tree_view);
+    }
 }
 
 static void