diff --git a/src/world/ClientWrapper.ts b/src/world/ClientWrapper.ts
index 900513c..44429eb 100644
--- a/src/world/ClientWrapper.ts
+++ b/src/world/ClientWrapper.ts
@@ -3,8 +3,10 @@ class ClientWrapper {
     public readonly stateManager: ClientState.Manager;
     public transientFor: ClientWrapper | null;
     private readonly transients: ClientWrapper[];
+    private readonly signalManager: SignalManager;
     private readonly rulesSignalManager: SignalManager | null;
     public preferredWidth: number;
+    private maximizedMode: MaximizedMode | undefined;
     private readonly manipulatingGeometry: Doer;
     private lastPlacement: QmlRect | null; // workaround for issue #19
 
@@ -20,6 +22,7 @@ class ClientWrapper {
         if (transientFor !== null) {
             transientFor.addTransient(this);
         }
+        this.signalManager = ClientWrapper.initSignalManager(this);
         this.rulesSignalManager = rulesSignalManager;
         this.preferredWidth = kwinClient.frameGeometry.width;
         this.manipulatingGeometry = new Doer();
@@ -98,6 +101,10 @@ class ClientWrapper {
         return this.kwinClient.shade;
     }
 
+    public getMaximizedMode() {
+        return this.maximizedMode;
+    }
+
     public isManipulatingGeometry(newGeometry: QmlRect | null) {
         if (newGeometry !== null && newGeometry === this.lastPlacement) {
             return true;
@@ -137,6 +144,7 @@ class ClientWrapper {
 
     public destroy(passFocus: boolean) {
         this.stateManager.destroy(passFocus);
+        this.signalManager.destroy();
         if (this.rulesSignalManager !== null) {
             this.rulesSignalManager.destroy();
         }
@@ -147,4 +155,14 @@ class ClientWrapper {
             transient.transientFor = null;
         }
     }
+
+    private static initSignalManager(client: ClientWrapper) {
+        const manager = new SignalManager();
+
+        manager.connect(client.kwinClient.maximizedAboutToChange, (maximizedMode: MaximizedMode) => {
+            client.maximizedMode = maximizedMode;
+        });
+
+        return manager;
+    }
 }
diff --git a/src/world/Clients.ts b/src/world/Clients.ts
index c69f0e4..1724dd7 100644
--- a/src/world/Clients.ts
+++ b/src/world/Clients.ts
@@ -34,11 +34,6 @@ namespace Clients {
         }
     }
 
-    export function isMaximizedGeometry(kwinClient: KwinClient) {
-        const maximizeArea = Workspace.clientArea(ClientAreaOption.MaximizeArea, kwinClient.output, getKwinDesktopApprox(kwinClient));
-        return kwinClient.frameGeometry === maximizeArea;
-    }
-
     export function isFullScreenGeometry(kwinClient: KwinClient) {
         const fullScreenArea = Workspace.clientArea(ClientAreaOption.FullScreenArea, kwinClient.output, getKwinDesktopApprox(kwinClient));
         return kwinClient.frameGeometry === fullScreenArea;
diff --git a/src/world/clientState/Tiled.ts b/src/world/clientState/Tiled.ts
index 956941a..e8695ba 100644
--- a/src/world/clientState/Tiled.ts
+++ b/src/world/clientState/Tiled.ts
@@ -126,7 +126,7 @@ namespace ClientState {
                 } else if (
                     !window.column.grid.isUserResizing() &&
                     !client.isManipulatingGeometry(newGeometry) &&
-                    !Clients.isMaximizedGeometry(kwinClient) &&
+                    client.getMaximizedMode() === MaximizedMode.Unmaximized &&
                     !Clients.isFullScreenGeometry(kwinClient) // not using `kwinClient.fullScreen` because it may not be set yet at this point
                 ) {
                     world.do(() => window.onFrameGeometryChanged());