diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp
index 2b35d86c0..b8f49f4be 100644
--- a/src/commands/CommandManager.cpp
+++ b/src/commands/CommandManager.cpp
@@ -198,9 +198,9 @@ public:
       }
 
       wxWindow *handler = project->GetKeyboardCaptureHandler();
-      if (handler)
+      if (handler && HandleCapture(handler, key))
       {
-         return HandleCapture(handler, key) ? Event_Processed : Event_Skip;
+         return Event_Processed;
       }
 
       CommandManager *manager = project->GetCommandManager();