diff --git a/geometry.cpp b/geometry.cpp
index 2078b2bf5c..7ae8b40a4c 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -2628,8 +2628,9 @@ void Client::finishMoveResize(bool cancel)
                                     moveResizeGeom.width() != initialMoveResizeGeom.width();
             const bool restoreV = maximizeMode() == MaximizeVertical &&
                                     moveResizeGeom.height() != initialMoveResizeGeom.height();
-            if (restoreH || restoreV) // NOT setMaximize(restoreH, restoreV); !
-                setMaximize(false, false);
+            if (restoreH || restoreV) {
+                changeMaximize(restoreV, restoreH, false);
+            }
         }
         setGeometry(moveResizeGeom);
     }