1 files changed, 6 insertions, 0 deletions
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 773e5409b4..a81b341dd6 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2502,6 +2502,12 @@ gtk_combo_box_popdown (GtkComboBox *combo_box)
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->button),
                                 FALSE);
 
+  if (priv->scroll_timer)
+    {
+      g_source_remove (priv->scroll_timer);
+      priv->scroll_timer = 0;
+    }
+
   priv->grab_pointer = NULL;
   priv->grab_keyboard = NULL;
 }