diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp
index 422ee0e2c0..6ba106411e 100644
--- a/eeschema/schedit.cpp
+++ b/eeschema/schedit.cpp
@@ -953,6 +953,9 @@ void SCH_EDIT_FRAME::OnRotate( wxCommandEvent& aEvent )
 
     RefreshItem( item );
 
+    if( item->IsMoving() )
+        m_canvas->CallMouseCapture( nullptr, wxDefaultPosition, false );
+
     if( item->GetFlags() == 0 )
         screen->SetCurItem( NULL );
 }
@@ -1311,6 +1314,9 @@ void SCH_EDIT_FRAME::OnOrient( wxCommandEvent& aEvent )
 
     RefreshItem( item );
 
+    if( item->IsMoving() )
+        m_canvas->CallMouseCapture( nullptr, wxDefaultPosition, false );
+
     if( item->GetFlags() == 0 )
         screen->SetCurItem( NULL );
 }