diff --git a/geometry.cpp b/geometry.cpp
index 1057218d56..ee7403458e 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -2096,6 +2096,8 @@ void Client::setMaximize(bool vertically, bool horizontally)
         max_mode & MaximizeVertical ? !vertically : vertically,
         max_mode & MaximizeHorizontal ? !horizontally : horizontally,
         false);
+    emit clientMaximizedStateChanged(this, max_mode);
+    emit clientMaximizedStateChanged(this, vertically, horizontally);
 
 }
 
@@ -2332,8 +2334,6 @@ void Client::changeMaximize(bool vertical, bool horizontal, bool adjust)
     syncer.syncNow(); // important because of window rule updates!
 
     updateAllowedActions();
-    emit clientMaximizedStateChanged(this, max_mode);
-    emit clientMaximizedStateChanged(this, vertical, horizontal);
     updateWindowRules(Rules::MaximizeVert|Rules::MaximizeHoriz|Rules::Position|Rules::Size);
 }