diff --git a/src/core/window.c b/src/core/window.c
index e0f42e942..f69d55c2a 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1741,12 +1741,17 @@ implement_showing (MetaWindow *window,
         meta_window_force_placement (window, FALSE);
 
       meta_window_hide (window);
+
+      if (!window->override_redirect)
+        sync_client_window_mapped (window);
     }
   else
-    meta_window_show (window);
+    {
+      if (!window->override_redirect)
+        sync_client_window_mapped (window);
 
-  if (!window->override_redirect)
-    sync_client_window_mapped (window);
+      meta_window_show (window);
+    }
 }
 
 void