diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index 92a9441c9a..e7181c6d7e 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -1338,7 +1338,7 @@ void SCH_EDIT_FRAME::AddItemToScreenAndUndoList( SCH_SCREEN* aScreen, SCH_ITEM*
         }
 
         // Update connectivity info for new item
-        if( !aItem->IsMoving() )
+        if( !aItem->IsMoving() && aItem->IsConnectable() )
             RecalculateConnections( LOCAL_CLEANUP );
     }
 
diff --git a/eeschema/tools/sch_edit_tool.cpp b/eeschema/tools/sch_edit_tool.cpp
index c174cc10f5..2d27904ba5 100644
--- a/eeschema/tools/sch_edit_tool.cpp
+++ b/eeschema/tools/sch_edit_tool.cpp
@@ -775,7 +775,7 @@ int SCH_EDIT_TOOL::Rotate( const TOOL_EVENT& aEvent )
         lwbTool->TrimOverLappingWires( &selectionCopy );
         lwbTool->AddJunctionsIfNeeded( &selectionCopy );
 
-        m_frame->RecalculateConnections( LOCAL_CLEANUP );
+        m_frame->SchematicCleanUp();
         m_frame->TestDanglingEnds();
 
         m_frame->OnModify();
@@ -969,7 +969,7 @@ int SCH_EDIT_TOOL::Mirror( const TOOL_EVENT& aEvent )
             lwbTool->TrimOverLappingWires( &selectionCopy );
             lwbTool->AddJunctionsIfNeeded( &selectionCopy );
 
-            m_frame->RecalculateConnections( LOCAL_CLEANUP );
+            m_frame->SchematicCleanUp();
             m_frame->TestDanglingEnds();
         }
 
@@ -1155,7 +1155,7 @@ int SCH_EDIT_TOOL::RepeatDrawItem( const TOOL_EVENT& aEvent )
         lwbTool->TrimOverLappingWires( &newItems );
         lwbTool->AddJunctionsIfNeeded( &newItems );
 
-        m_frame->RecalculateConnections( LOCAL_CLEANUP );
+        m_frame->SchematicCleanUp();
         m_frame->TestDanglingEnds();
     }
 
diff --git a/eeschema/tools/sch_move_tool.cpp b/eeschema/tools/sch_move_tool.cpp
index f0233b2ebe..87154369e2 100644
--- a/eeschema/tools/sch_move_tool.cpp
+++ b/eeschema/tools/sch_move_tool.cpp
@@ -930,7 +930,7 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
         for( EDA_ITEM* item : selection )
             m_frame->AutoRotateItem( m_frame->GetScreen(), static_cast<SCH_ITEM*>( item ) );
 
-        m_frame->RecalculateConnections( LOCAL_CLEANUP );
+        m_frame->SchematicCleanUp();
         m_frame->OnModify();
     }
 
@@ -1735,7 +1735,7 @@ int SCH_MOVE_TOOL::AlignElements( const TOOL_EVENT& aEvent )
 
     m_toolMgr->PostEvent( EVENTS::SelectedItemsMoved );
 
-    m_frame->RecalculateConnections( LOCAL_CLEANUP );
+    m_frame->SchematicCleanUp();
     m_frame->TestDanglingEnds();
 
     m_frame->OnModify();