diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index c947210f7f..45dd00b76b 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -2493,7 +2493,10 @@ gtk_entry_completion_changed (GtkWidget *widget,
 
   /* (re)install completion timeout */
   if (completion->priv->completion_timeout)
+  {
     g_source_remove (completion->priv->completion_timeout);
+    completion->priv->completion_timeout = 0;
+  }
 
   if (!gtk_entry_get_text (entry))
     return;