diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 84792c7da0..d4f6e9810c 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2664,13 +2664,13 @@ gtk_window_dispose (GObject *object)
   GtkWindow *window = GTK_WINDOW (object);
   GtkWindowPrivate *priv = window->priv;
 
+  g_hash_table_remove_all (priv->popovers);
+
   gtk_window_set_focus (window, NULL);
   gtk_window_set_default (window, NULL);
   unset_titlebar (window);
   remove_attach_widget (window);
 
-  g_hash_table_remove_all (priv->popovers);
-
   G_OBJECT_CLASS (gtk_window_parent_class)->dispose (object);
 }