diff --git a/useractions.cpp b/useractions.cpp
index 1e151a1fce..b0c3c2eb13 100755
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -897,6 +897,8 @@ void Workspace::setupWindowShortcutDone(bool ok)
     client_keys_dialog->deleteLater();
     client_keys_dialog = NULL;
     client_keys_client = NULL;
+    if (active_client)
+        active_client->takeFocus(Allowed);
 }
 
 void Workspace::clientShortcutUpdated(Client* c)