diff --git a/client.cpp b/client.cpp
index 34663bd7ec..79fa4ff5e4 100644
--- a/client.cpp
+++ b/client.cpp
@@ -176,6 +176,7 @@ void Client::releaseWindow( bool on_shutdown )
         {
         workspace()->clientHidden( this );
         XUnmapWindow( qt_xdisplay(), window()); // destroying decoration would cause ugly visual effect
+        XUnmapWindow( qt_xdisplay(), wrapperId());
         }
     destroyDecoration();
     cleanGrouping();