diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp
index 41b5b67930..1c5b80c4c2 100644
--- a/eeschema/tools/ee_selection_tool.cpp
+++ b/eeschema/tools/ee_selection_tool.cpp
@@ -858,7 +858,10 @@ bool EE_SELECTION_TOOL::selectPoint( EE_COLLECTOR& aCollector, EDA_ITEM** aItem,
         // But it we cannot handle the event, then we don't have an active tool loop, so
         // handle it directly.
         if( !m_toolMgr->RunAction( EE_ACTIONS::selectionMenu, true, &aCollector ) )
-            doSelectionMenu( &aCollector );
+        {
+            if( !doSelectionMenu( &aCollector ) )
+                aCollector.m_MenuCancelled = true;
+        }
 
         if( aCollector.m_MenuCancelled )
         {