diff --git a/geometry.cpp b/geometry.cpp
index 4b689d77ba..b0002f1c09 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -1719,8 +1719,7 @@ void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force )
                 cs.width(), cs.height());
             XMoveResizeWindow( display(), window(), 0, 0, cs.width(), cs.height());
             }
-        if( shape())
-            updateShape();
+        updateShape();
         }
     else
         XMoveWindow( display(), frameId(), x, y );
diff --git a/manage.cpp b/manage.cpp
index 7b3347e760..0051de248d 100644
--- a/manage.cpp
+++ b/manage.cpp
@@ -331,8 +331,7 @@ bool Client::manage( Window w, bool isMapped )
     if(( !isSpecialWindow() || isToolbar()) && isMovable())
         keepInArea( area, partial_keep_in_area );
 
-    if( shape()) 
-        updateShape();
+    updateShape();
 	
     //CT extra check for stupid jdk 1.3.1. But should make sense in general
     // if client has initial state set to Iconic and is transient with a parent