diff --git a/pcbnew/router/length_tuner_tool.cpp b/pcbnew/router/length_tuner_tool.cpp
index 5aceba2554..6e4b446d14 100644
--- a/pcbnew/router/length_tuner_tool.cpp
+++ b/pcbnew/router/length_tuner_tool.cpp
@@ -224,6 +224,8 @@ void LENGTH_TUNER_TOOL::performTuning()
     }
 
     m_router->StopRouting();
+    controls()->SetAutoPan( false );
+    controls()->ForceCursorPosition( false );
     highlightNet( false );
 }
 
diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index 0c375e3b20..561dd3d0eb 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -1128,6 +1128,8 @@ int ROUTER_TOOL::InlineDrag( const TOOL_EVENT& aEvent )
     if( m_router->RoutingInProgress() )
         m_router->StopRouting();
 
+    controls()->SetAutoPan( false );
+    controls()->ForceCursorPosition( false );
     frame()->UndoRedoBlock( false );
 
     return 0;