diff --git a/geometry.cpp b/geometry.cpp
index 7cd406c3c8..807380c4c9 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -1714,8 +1714,9 @@ void Client::postponeGeometryUpdates( bool postpone )
     {
     if( postpone )
         {
+        if( postpone_geometry_updates == 0 )
+            pending_geometry_update = false;
         ++postpone_geometry_updates;
-        pending_geometry_update = false;
         }
     else
         {
diff --git a/manage.cpp b/manage.cpp
index 8c6f4a5941..cfa358b815 100644
--- a/manage.cpp
+++ b/manage.cpp
@@ -44,6 +44,7 @@ bool Client::manage( Window w, bool isMapped )
 
     // from this place on, manage() mustn't return false
     postpone_geometry_updates = 1;
+    pending_geometry_update = true; // force update when finishing with geometry changes
 
     embedClient( w, attr );