diff --git a/ChangeLog b/ChangeLog
index 0d4ba3d529..c02c922a2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-13  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_stop_rubber_band): only
+	queue a redraw if the rubber banding has actually been active.
+
 2008-02-12  Matthias Clasen  <mclasne@redhat.com>
 
 	* gtk/gtkpapersize.c:
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index ce67dce9c7..6148372333 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3675,12 +3675,12 @@ gtk_tree_view_stop_rubber_band (GtkTreeView *tree_view)
   remove_scroll_timeout (tree_view);
   gtk_grab_remove (GTK_WIDGET (tree_view));
 
-  gtk_widget_queue_draw (GTK_WIDGET (tree_view));
-
   if (tree_view->priv->rubber_band_status == RUBBER_BAND_ACTIVE)
     {
       GtkTreePath *tmp_path;
 
+      gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+
       /* The anchor path should be set to the start path */
       tmp_path = _gtk_tree_view_find_path (tree_view,
 					   tree_view->priv->rubber_band_start_tree,