diff --git a/pcbnew/tools/selection_tool.cpp b/pcbnew/tools/selection_tool.cpp
index df5709aae5..85ec289e80 100644
--- a/pcbnew/tools/selection_tool.cpp
+++ b/pcbnew/tools/selection_tool.cpp
@@ -516,7 +516,14 @@ void SELECTION_TOOL::findCallback( BOARD_ITEM* aItem )
     clearSelection();
 
     if( aItem )
-        toggleSelection( aItem );
+    {
+        clearSelection();
+        select( aItem );
+
+        // Inform other potentially interested tools
+        TOOL_EVENT selectEvent( SelectedEvent );
+        m_toolMgr->ProcessEvent( selectEvent );
+    }
 
     m_frame->GetGalCanvas()->ForceRefresh();
 }