diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 496a010f4e..c6db4e8126 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -191,8 +191,8 @@ gtk_application_window_removed (GtkApplication *application,
                                         application);
 
   g_application_release (G_APPLICATION (application));
-  gtk_window_set_application (window, NULL);
   priv->windows = g_list_remove (priv->windows, window);
+  gtk_window_set_application (window, NULL);
 }
 
 static void