diff --git a/eeschema/block.cpp b/eeschema/block.cpp
index 27a7482c0c..065c5311f3 100644
--- a/eeschema/block.cpp
+++ b/eeschema/block.cpp
@@ -130,6 +130,10 @@ void SCH_EDIT_FRAME::HandleBlockPlace( wxDC* DC )
         {
             // This calls the block-abort command routine on cleanup
             m_canvas->EndMouseCapture( GetToolId(), GetGalCanvas()->GetCurrentCursor() );
+
+            // We set the dangling ends to the block-scope, so we must set them back to
+            // schematic-socpe.
+            TestDanglingEnds();
             return;
         }
 
diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp
index 315d5fefbf..224f23fe55 100644
--- a/eeschema/schedit.cpp
+++ b/eeschema/schedit.cpp
@@ -754,6 +754,7 @@ static void abortMoveItem( EDA_DRAW_PANEL* aPanel, wxDC* aDC )
             parent->RefreshItem( currentItem );
     }
 
+    screen->TestDanglingEnds();
     aPanel->Refresh();
 }