diff --git a/eeschema/tools/sch_move_tool.cpp b/eeschema/tools/sch_move_tool.cpp
index c29ae15aca..5582bc8dee 100644
--- a/eeschema/tools/sch_move_tool.cpp
+++ b/eeschema/tools/sch_move_tool.cpp
@@ -157,7 +157,6 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
 
     Activate();
     controls->ShowCursor( true );
-    controls->SetAutoPan( true );
 
     bool restore_state = false;
     bool chain_commands = false;
@@ -424,6 +423,8 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
             break; // Finish
         }
 
+        controls->SetAutoPan( m_moveInProgress );
+
     } while( ( evt = Wait() ) ); //Should be assignment not equality test
 
     controls->ForceCursorPosition( false );