diff --git a/src/core/window.c b/src/core/window.c
index e4b5b3c91..0cffc9fa8 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -948,8 +948,6 @@ _meta_window_shared_new (MetaDisplay         *display,
 
   window->opacity = 0xFF;
 
-  META_WINDOW_GET_CLASS (window)->manage (window);
-
   if (window->override_redirect)
     {
       window->decorated = FALSE;
@@ -960,6 +958,8 @@ _meta_window_shared_new (MetaDisplay         *display,
       window->has_resize_func = FALSE;
     }
 
+  META_WINDOW_GET_CLASS (window)->manage (window);
+
   if (!window->override_redirect)
     meta_window_update_icon_now (window);