diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 81aa989..f4eb82e 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -2011,9 +2011,12 @@
     if (event_type != ConfigureNotify && event_type != PropertyNotify)
         event_type = 0;  /* ignore other events */
 
-    if (data->mapped && (!(new_style & WS_VISIBLE) ||
-                         (!event_type && !is_window_rect_mapped( rectWindow ))))
-        unmap_window( display, data );
+    if (data->mapped)
+    {
+        if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) ||
+            (!event_type && !is_window_rect_mapped( rectWindow )))
+            unmap_window( display, data );
+    }
 
     /* don't change position if we are about to minimize or maximize a managed window */
     if (!event_type &&