diff --git a/source/sw/src/input.cpp b/source/sw/src/input.cpp
index cace1e61f..29ad32ad1 100644
--- a/source/sw/src/input.cpp
+++ b/source/sw/src/input.cpp
@@ -150,7 +150,7 @@ getinput(SW_PACKET *loc, SWBOOL tied)
     // If in 2D follow mode, scroll around using glob vars
     // Tried calling this in domovethings, but key response it too poor, skips key presses
     // Note: this get called only during follow mode
-    if (!tied && automapFollow && pp == Player + myconnectindex && !Prediction)
+    if (!tied && automapFollow && automapMode != am_off && && pp == Player + myconnectindex && !Prediction)
         MoveScrollMode2D(Player + myconnectindex);
 
     // !JIM! Added M_Active() so that you don't move at all while using menus