diff --git a/eeschema/bus-wire-junction.cpp b/eeschema/bus-wire-junction.cpp
index b094e2eaa1..9c9791944c 100644
--- a/eeschema/bus-wire-junction.cpp
+++ b/eeschema/bus-wire-junction.cpp
@@ -450,7 +450,9 @@ bool SCH_EDIT_FRAME::TrimWire( const wxPoint& aStart, const wxPoint& aEnd, bool
     {
         next_item = item->Next();
 
-        if( item->GetFlags() & STRUCT_DELETED )
+        // Don't remove wires that are already deleted, are currently being
+        // dragged or are just created
+        if( item->GetFlags() & ( STRUCT_DELETED | IS_DRAGGED | IS_NEW ) )
             continue;
 
         if( item->Type() != SCH_LINE_T || item->GetLayer() != LAYER_WIRE )
diff --git a/eeschema/project_rescue.cpp b/eeschema/project_rescue.cpp
index a6a48cf298..1dd76cb819 100644
--- a/eeschema/project_rescue.cpp
+++ b/eeschema/project_rescue.cpp
@@ -586,8 +586,6 @@ bool SCH_EDIT_FRAME::rescueProject( RESCUER& aRescuer, bool aRunningOnDemand )
     if( viewer )
         viewer->ReCreateListLib();
 
-    // Clean up wire ends
-    SchematicCleanUp();
     GetScreen()->ClearUndoORRedoList( GetScreen()->m_UndoList, 1 );
     m_canvas->Refresh( true );
     OnModify();