diff --git a/client.cpp b/client.cpp
index 3fa930b664..379c0cc373 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1645,6 +1645,8 @@ void Client::dontMoveResize()
 
 void Client::setClientShown( bool shown )
     {
+    if( deleting )
+        return; // Don't change shown status if this client is being deleted
     if( !shown )
         {
         unmap( Allowed );