diff --git a/eeschema/tools/sch_line_wire_bus_tool.cpp b/eeschema/tools/sch_line_wire_bus_tool.cpp
index 4b9d508bd0..1fffe14652 100644
--- a/eeschema/tools/sch_line_wire_bus_tool.cpp
+++ b/eeschema/tools/sch_line_wire_bus_tool.cpp
@@ -1230,6 +1230,9 @@ void SCH_LINE_WIRE_BUS_TOOL::finishSegments()
     if( m_busUnfold.in_progress )
         m_busUnfold = {};
 
+    for( SCH_ITEM* item : m_frame->GetScreen()->Items() )
+        item->ClearEditFlags();
+
     m_frame->TestDanglingEnds();
     m_toolMgr->PostEvent( EVENTS::SelectedItemsModified );
 
diff --git a/eeschema/tools/sch_move_tool.cpp b/eeschema/tools/sch_move_tool.cpp
index 875cbd232c..88a06398dc 100644
--- a/eeschema/tools/sch_move_tool.cpp
+++ b/eeschema/tools/sch_move_tool.cpp
@@ -931,7 +931,7 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
         m_frame->OnModify();
     }
 
-    for( EDA_ITEM* item : selectionCopy )
+    for( EDA_ITEM* item : m_frame->GetScreen()->Items() )
         item->ClearEditFlags();
 
     if( unselect )