diff --git a/pcbnew/tools/selection_tool.cpp b/pcbnew/tools/selection_tool.cpp
index 1eeba1c6d4..dc52429a4c 100644
--- a/pcbnew/tools/selection_tool.cpp
+++ b/pcbnew/tools/selection_tool.cpp
@@ -812,6 +812,8 @@ BOARD_ITEM* SELECTION_TOOL::disambiguationMenu( GENERAL_COLLECTOR* aCollector )
             // User has selected an item, so this one will be returned
             if( id && ( *id > 0 ) )
                 current = ( *aCollector )[*id - 1];
+            else
+                current = NULL;
 
             break;
         }