diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index 2442adf6f8..a7dd00f1cf 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -433,7 +433,10 @@ int DRAWING_TOOL::PlaceText( const TOOL_EVENT& aEvent )
                     } );
 
                     if( textPcb->GetText().IsEmpty() )
+                    {
+                        m_controls->ForceCursorPosition( false );
                         delete textPcb;
+                    }
                     else
                         text = textPcb;
                 }
@@ -677,6 +680,7 @@ int DRAWING_TOOL::DrawDimension( const TOOL_EVENT& aEvent )
         delete dimension;
 
     m_controls->SetAutoPan( false );
+    m_controls->ForceCursorPosition( false );
 
     m_view->Remove( &preview );
     frame()->SetMsgPanel( board() );