diff --git a/src/kwinscript/driver/index.ts b/src/kwinscript/driver/index.ts
index 0c36c434..b0bb6970 100644
--- a/src/kwinscript/driver/index.ts
+++ b/src/kwinscript/driver/index.ts
@@ -222,6 +222,14 @@ export class DriverImpl implements Driver {
         "unminimized"
       );
 
+    this.connect(this.kwinApi.workspace.currentActivityChanged, () =>
+      this.controller.onCurrentSurfaceChanged()
+    );
+
+    this.connect(this.kwinApi.workspace.currentDesktopChanged, () =>
+      this.controller.onCurrentSurfaceChanged()
+    );
+
     this.connect(this.kwinApi.workspace.clientAdded, onClientAdded);
     this.connect(this.kwinApi.workspace.clientRemoved, onClientRemoved);
     this.connect(this.kwinApi.workspace.clientMaximizeSet, onClientMaximizeSet);