diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp
index 2afb08cb3a..fb279b856c 100644
--- a/eeschema/hotkeys.cpp
+++ b/eeschema/hotkeys.cpp
@@ -480,10 +480,11 @@ bool SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
         }
         else if( screen->m_BlockLocate.GetState() == STATE_NO_BLOCK )
         {
-            OnLeftClick( aDC, aPosition );
+            auto pos = GetCrossHairPosition();
+            OnLeftClick( aDC, pos );
 
             if( hotKey->m_Idcommand == HK_LEFT_DCLICK )
-                OnLeftDClick( aDC, aPosition );
+                OnLeftDClick( aDC, pos );
         }
         break;
 
diff --git a/eeschema/sch_draw_panel.cpp b/eeschema/sch_draw_panel.cpp
index 1e597ad0cc..53b5cae539 100644
--- a/eeschema/sch_draw_panel.cpp
+++ b/eeschema/sch_draw_panel.cpp
@@ -676,7 +676,7 @@ void SCH_DRAW_PANEL::OnKeyEvent( wxKeyEvent& event )
     // Compute the cursor position in drawing units.  Also known as logical units to wxDC.
     //pos = wxPoint( DC.DeviceToLogicalX( pos.x ), DC.DeviceToLogicalY( pos.y ) );
 
-    auto p =  GetViewControls()->GetMousePosition();
+    auto p =  GetViewControls()->GetCursorPosition( false );
 
     wxPoint pos ((int)p.x, (int)p.y);