diff --git a/common/tool/action_menu.cpp b/common/tool/action_menu.cpp
index 7f5d35d49a..c4271bba8d 100644
--- a/common/tool/action_menu.cpp
+++ b/common/tool/action_menu.cpp
@@ -415,7 +415,12 @@ void ACTION_MENU::OnMenuEvent( wxMenuEvent& aEvent )
                     focus->HandleWindowEvent( keyEvent );
                 }
 
-                return;
+                // If the event was used as KEY event (not skipped) by the focused window,
+                // just finish.
+                // Otherwise this is actually a wxEVT_COMMAND_MENU_SELECTED, or the
+                // focused window is read only
+                if( !keyEvent.GetSkipped() )
+                    return;
             }
         }