diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index bf352ccd07..d68afff2fb 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -525,6 +525,8 @@ int DRAWING_TOOL::DrawDimension( const TOOL_EVENT& aEvent )
 
         if( TOOL_EVT_UTILS::IsCancelInteractive( *evt ) )
         {
+            m_controls->SetAutoPan( false );
+
             if( step != SET_ORIGIN )    // start from the beginning
             {
                 preview.Clear();
@@ -663,6 +665,8 @@ int DRAWING_TOOL::DrawDimension( const TOOL_EVENT& aEvent )
     if( step != SET_ORIGIN )
         delete dimension;
 
+    m_controls->SetAutoPan( false );
+
     m_view->Remove( &preview );
     frame()->SetMsgPanel( board() );
     m_frame->SetNoToolSelected();