diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 582287a422..c947210f7f 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -2683,6 +2683,8 @@ _gtk_entry_completion_disconnect (GtkEntryCompletion *completion)
 
   unset_accessible_relation (completion->priv->popup_window,
                              completion->priv->entry);
+  gtk_window_set_attached_to (GTK_WINDOW (completion->priv->popup_window),
+                              NULL);
 
   completion->priv->entry = NULL;
 }
@@ -2695,6 +2697,8 @@ _gtk_entry_completion_connect (GtkEntryCompletion *completion,
 
   set_accessible_relation (completion->priv->popup_window,
                            completion->priv->entry);
+  gtk_window_set_attached_to (GTK_WINDOW (completion->priv->popup_window),
+                              completion->priv->entry);
 
   connect_completion_signals (completion);
 }