diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index d27e7e767c..4ab8755583 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -11338,6 +11338,9 @@ gtk_tree_view_set_model (GtkTreeView  *tree_view,
       tree_view->priv->scroll_to_path = NULL;
     }
 
+  if (tree_view->priv->rubber_band_status)
+    gtk_tree_view_stop_rubber_band (tree_view);
+
   if (tree_view->priv->model)
     {
       GList *tmplist = tree_view->priv->columns;