diff --git a/src/tests/utils/mocks/MockWorkspace.ts b/src/tests/utils/mocks/MockWorkspace.ts
index d53eb99..a377560 100644
--- a/src/tests/utils/mocks/MockWorkspace.ts
+++ b/src/tests/utils/mocks/MockWorkspace.ts
@@ -54,12 +54,14 @@ class MockWorkspace {
     public removeWindow(window: MockKwinClient) {
         this.activeWindow = null;
         runReorder(
+            () => {
+                if (this.activeWindow === null) {
+                    activateRandomWindowOnDesktop(this.currentDesktop);
+                };
+            },
             () => this.windows.splice(this.windows.indexOf(window), 1),
             () => this.windowRemoved.fire(window),
         );
-        if (this.activeWindow === null) {
-            activateRandomWindowOnDesktop(this.currentDesktop);
-        };
     }
 
     public moveWindow(window: MockKwinClient, ...deltas: QmlPoint[]) {