diff --git a/src/world/ClientWrapper.ts b/src/world/ClientWrapper.ts
index 44429eb..3e3d907 100644
--- a/src/world/ClientWrapper.ts
+++ b/src/world/ClientWrapper.ts
@@ -160,6 +160,9 @@ class ClientWrapper {
         const manager = new SignalManager();
 
         manager.connect(client.kwinClient.maximizedAboutToChange, (maximizedMode: MaximizedMode) => {
+            if (maximizedMode > MaximizedMode.Unmaximized && client.kwinClient.tile !== null) {
+                client.kwinClient.tile = null;
+            }
             client.maximizedMode = maximizedMode;
         });
 
diff --git a/src/world/clientState/Pinned.ts b/src/world/clientState/Pinned.ts
index 5e85b3a..2d09199 100644
--- a/src/world/clientState/Pinned.ts
+++ b/src/world/clientState/Pinned.ts
@@ -41,10 +41,6 @@ namespace ClientState {
                 }
             });
 
-            manager.connect(kwinClient.maximizedChanged, () => {
-                kwinClient.tile = null;
-            });
-
             manager.connect(kwinClient.frameGeometryChanged, () => {
                 if (kwinClient.tile === null) {
                     world.do((clientManager, desktopManager) => {
diff --git a/src/world/clientState/Tiled.ts b/src/world/clientState/Tiled.ts
index e8695ba..9376e67 100644
--- a/src/world/clientState/Tiled.ts
+++ b/src/world/clientState/Tiled.ts
@@ -63,9 +63,6 @@ namespace ClientState {
             });
 
             manager.connect(kwinClient.maximizedAboutToChange, (maximizedMode: MaximizedMode) => {
-                if (maximizedMode > MaximizedMode.Unmaximized && kwinClient.tile !== null) {
-                    kwinClient.tile = null;
-                }
                 world.do(() => {
                     window.onMaximizedChanged(maximizedMode);
                 });