diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 885b691f08..8a90868f44 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -235,6 +235,8 @@ gtk_popover_dispose (GObject *object)
   GtkPopover *popover = GTK_POPOVER (object);
   GtkPopoverPrivate *priv = popover->priv;
 
+  gtk_widget_set_visible (GTK_WIDGET (object), FALSE);
+
   if (priv->window)
     _gtk_window_remove_popover (priv->window, GTK_WIDGET (object));
 
@@ -249,7 +251,6 @@ gtk_popover_dispose (GObject *object)
       priv->prev_focus_widget = NULL;
     }
 
-  gtk_widget_set_visible (GTK_WIDGET (object), FALSE);
   G_OBJECT_CLASS (gtk_popover_parent_class)->dispose (object);
 }