diff --git a/src/extern.d.ts b/src/extern.d.ts
index c9d111c..2b190b4 100644
--- a/src/extern.d.ts
+++ b/src/extern.d.ts
@@ -8,6 +8,7 @@ declare const options;
 type AbstractClient = any;
 type TopLevel = any;
 type X11Client = any;
+type Tile = any;
 type QRect = any;
 type QSignal = any;
 type QQmlTimer = any;
diff --git a/src/world/clientstate/Tiled.ts b/src/world/clientstate/Tiled.ts
index c253ece..b523b73 100644
--- a/src/world/clientstate/Tiled.ts
+++ b/src/world/clientstate/Tiled.ts
@@ -93,6 +93,14 @@ namespace ClientState {
                 });
             });
 
+            manager.connect(kwinClient.tileChanged, (tile: Tile) => {
+                if (tile !== null) {
+                    world.do((clientManager, desktopManager) => {
+                        clientManager.untileClient(kwinClient);
+                    })
+                }
+            });
+
             return manager;
         }