diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 849ff8c196..6680ec8017 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -3119,12 +3119,12 @@ gtk_window_dispose (GObject *object)
   GtkWindow *window = GTK_WINDOW (object);
   GtkWindowPrivate *priv = window->priv;
 
-  unset_titlebar (window);
   gtk_window_set_focus (window, NULL);
   gtk_window_set_default (window, NULL);
   remove_attach_widget (window);
 
   G_OBJECT_CLASS (gtk_window_parent_class)->dispose (object);
+  unset_titlebar (window);
 
   while (priv->popovers)
     {