diff --git a/eeschema/libedit/controller.cpp b/eeschema/libedit/controller.cpp
index 8164e562d4..4501ae40a9 100644
--- a/eeschema/libedit/controller.cpp
+++ b/eeschema/libedit/controller.cpp
@@ -68,6 +68,11 @@ bool LIB_EDIT_FRAME::GeneralControl( wxDC* aDC, const wxPoint& aPosition, EDA_KE
     wxPoint pos = aPosition;
     bool keyHandled = GeneralControlKeyMovement( aHotKey, &pos, snapToGrid );
 
+    if( GetToolId() == ID_NO_TOOL_SELECTED )
+        m_canvas->CrossHairOff( aDC );
+    else
+        m_canvas->CrossHairOn( aDC );
+
     SetCrossHairPosition( pos, snapToGrid );
 
     if( m_canvas->IsMouseCaptured() )