diff --git a/client.cpp b/client.cpp
index 20a0e873c5..d692e45950 100644
--- a/client.cpp
+++ b/client.cpp
@@ -517,7 +517,6 @@ void Client::updateShape()
         noborder = true;
         updateDecoration( true );
         }
-    updateShape();
     }
 
 void Client::setMask( const QRegion& reg, int mode )
@@ -552,6 +551,7 @@ void Client::setMask( const QRegion& reg, int mode )
         scene->windowGeometryShapeChanged( this );
     if( effects != NULL )
         static_cast<EffectsHandlerImpl*>(effects)->windowGeometryShapeChanged( effectWindow(), geometry());
+    updateShape();
     }
 
 QRegion Client::mask() const