diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp
index e480ee98c5..b851350713 100644
--- a/eeschema/tools/sch_editor_control.cpp
+++ b/eeschema/tools/sch_editor_control.cpp
@@ -1020,17 +1020,18 @@ static bool highlightNet( TOOL_MANAGER* aToolMgr, const VECTOR2D& aPosition )
         }
     }
 
-    if( !conn )
+    if( !conn || conn == editFrame->GetHighlightedConnection() )
     {
         editFrame->SetStatusText( wxEmptyString );
         editFrame->SendCrossProbeClearHighlight();
+        editFrame->SetHighlightedConnection( nullptr );
     }
     else
     {
         editFrame->SetCrossProbeConnection( conn );
+        editFrame->SetHighlightedConnection( conn );
     }
 
-    editFrame->SetHighlightedConnection( conn );
     editFrame->UpdateNetHighlightStatus();
 
     TOOL_EVENT dummy;