diff --git a/manage.cpp b/manage.cpp
index 2541b34287..b19b052c70 100644
--- a/manage.cpp
+++ b/manage.cpp
@@ -474,12 +474,6 @@ bool Client::manage( Window w, bool isMapped )
     if( isTopMenu())
         hideClient( true );
 
-    if ( !doNotShow )
-        {
-        workspace()->updateClientArea();
-        area = workspace()->clientArea( geometry().center() );
-        }
-
     if( user_time == CurrentTime ) // no known user time, set something old
         user_time = qt_x_time - 1000000;
 
diff --git a/workspace.cpp b/workspace.cpp
index 462d263e97..4144bf9e1f 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -426,6 +426,7 @@ void Workspace::addClient( Client* c, allowed_t )
         }
     if( !unconstrained_stacking_order.contains( c ))
         unconstrained_stacking_order.append( c );
+    updateClientArea(); // this cannot be in manage(), because the client got added only now
     updateClientLayer( c );
     if( c->isDesktop())
         {