diff --git a/src/core/window.c b/src/core/window.c
index 94be7a5c4..b65ca61e0 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1014,6 +1014,9 @@ meta_window_new_with_attrs (MetaDisplay       *display,
       set_net_wm_state (window);
     }
 
+  if (screen->display->compositor)
+    meta_compositor_add_window (screen->display->compositor, window);
+
   /* Sync stack changes */
   meta_stack_thaw (window->screen->stack);
 
@@ -1045,9 +1048,6 @@ meta_window_new_with_attrs (MetaDisplay       *display,
 
   window->constructing = FALSE;
 
-  if (screen->display->compositor)
-    meta_compositor_add_window (screen->display->compositor, window);
-
   return window;
 }