diff --git a/common/tool/tool_manager.cpp b/common/tool/tool_manager.cpp
index 99e9b64f69..187c978d6b 100644
--- a/common/tool/tool_manager.cpp
+++ b/common/tool/tool_manager.cpp
@@ -704,6 +704,7 @@ TOOL_MANAGER::ID_LIST::iterator TOOL_MANAGER::finishTool( TOOL_STATE* aState )
 
     // Set transitions to be ready for future TOOL_EVENTs
     aState->theTool->SetTransitions();
+    m_viewControls->ForceCursorPosition( false );
 
     return it;
 }
diff --git a/common/view/view_controls.cpp b/common/view/view_controls.cpp
index 3330653a3d..1620783412 100644
--- a/common/view/view_controls.cpp
+++ b/common/view/view_controls.cpp
@@ -78,5 +78,7 @@ void VIEW_CONTROLS::ApplySettings( const VC_SETTINGS& aSettings )
     SetAutoPan( aSettings.m_autoPanEnabled );
     SetAutoPanMargin( aSettings.m_autoPanMargin );
     SetAutoPanSpeed( aSettings.m_autoPanSpeed );
-    ForceCursorPosition( aSettings.m_forceCursorPosition, aSettings.m_forcedPosition );
+    // storing 'force cursor position' causes more harm than advantage
+    // let the tools control this setting
+    //ForceCursorPosition( aSettings.m_forceCursorPosition, aSettings.m_forcedPosition );
 }