diff --git a/shell_client.cpp b/shell_client.cpp
index a6c43a14a6..2f3ca217be 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -789,6 +789,9 @@ void ShellClient::takeFocus()
 
 void ShellClient::doSetActive()
 {
+    if (!isActive()) {
+        return;
+    }
     StackingUpdatesBlocker blocker(workspace());
     workspace()->focusToNull();
 }