diff --git a/autotests/integration/quick_tiling_test.cpp b/autotests/integration/quick_tiling_test.cpp
index e1feb88b48..935dccb575 100644
--- a/autotests/integration/quick_tiling_test.cpp
+++ b/autotests/integration/quick_tiling_test.cpp
@@ -712,10 +712,6 @@ void QuickTilingTest::testShortcut()
 
     const int numberOfQuickTileActions = shortcutList.count();
 
-    if (numberOfQuickTileActions > 1) {
-        QTest::qWait(1001);
-    }
-
     for (QString shortcut : shortcutList) {
         // invoke global shortcut through dbus
         auto msg = QDBusMessage::createMethodCall(
diff --git a/src/activation.cpp b/src/activation.cpp
index 8b273cf426..811ca0b0a1 100644
--- a/src/activation.cpp
+++ b/src/activation.cpp
@@ -333,6 +333,8 @@ void Workspace::activateWindow(Window *window, bool force)
         // updateUserTime is X11 specific
         x11Window->updateUserTime();
     }
+
+    m_quickTileCombineTimer->stop();
 }
 
 /**