diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index 9e66921c5c..c8b1ec4f06 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -1739,7 +1739,8 @@ void SCH_EDIT_FRAME::RecalculateConnections( SCH_COMMIT* aCommit, SCH_CLEANUP_FL
 
                 SCH_CONNECTION* connection = aChangedItem->Connection();
 
-                if( connection && ( connection->Name() == highlightedConn ) )
+                if( connection
+                    && ( connection->Name() == highlightedConn || connection->HasDriverChanged() ) )
                     m_highlightedConnChanged = true;
             };
 
diff --git a/eeschema/schematic_undo_redo.cpp b/eeschema/schematic_undo_redo.cpp
index 71c3d779fb..7468425598 100644
--- a/eeschema/schematic_undo_redo.cpp
+++ b/eeschema/schematic_undo_redo.cpp
@@ -109,9 +109,9 @@ void SCH_EDIT_FRAME::SaveCopyInUndoList( SCH_SCREEN* aScreen, SCH_ITEM* aItem,
 
     if( aDirtyConnectivity )
     {
-        if( !aItem->IsConnectivityDirty()
-                && aItem->Connection()
-                && ( aItem->Connection()->Name() == m_highlightedConn ) )
+        if( !aItem->IsConnectivityDirty() && aItem->Connection()
+            && ( aItem->Connection()->Name() == m_highlightedConn
+                 || aItem->Connection()->HasDriverChanged() ) )
         {
             m_highlightedConnChanged = true;
         }