diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp
index 9d06c96fe0..b6efb49592 100644
--- a/eeschema/onrightclick.cpp
+++ b/eeschema/onrightclick.cpp
@@ -148,6 +148,9 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
         // If the clarify item selection context menu is aborted, don't show the context menu.
         if( item == NULL && actionCancelled )
             return false;
+
+        if( item )
+            SetCrossHairPosition( item->GetPosition(), false );
     }
 
     // If a command is in progress: add "cancel" and "end tool" menu
diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp
index 233af91dfe..bfde97491b 100644
--- a/eeschema/schedit.cpp
+++ b/eeschema/schedit.cpp
@@ -413,6 +413,8 @@ void SCH_EDIT_FRAME::OnMoveItem( wxCommandEvent& aEvent )
             return;
     }
 
+    GetCanvas()->GetViewControls()->WarpCursor( GetCrossHairPosition(), true );
+
     switch( item->Type() )
     {
     case SCH_LINE_T: