diff --git a/source/core/automap.cpp b/source/core/automap.cpp
index c83e1fbb2..172e52e65 100644
--- a/source/core/automap.cpp
+++ b/source/core/automap.cpp
@@ -212,7 +212,7 @@ void AutomapControl()
 		}
 		am_zoomdir = 0;
 
-		double j = interval * (120. / 1000);
+		double j = interval * 35. / gZoom;
 
 		if (buttonMap.ButtonDown(gamefunc_Enlarge_Screen))
 			gZoom += (int)fmulscale6(j, max(gZoom, 256));
@@ -241,8 +241,8 @@ void AutomapControl()
 			momx += mulscale9(panhorz, sintable[(follow_a) & 2047]);
 			momy += mulscale9(panhorz, sintable[(follow_a + 1536) & 2047]);
 
-			follow_x += int((momx * j) / (gZoom * 4000.));
-			follow_y += int((momy * j) / (gZoom * 4000.));
+			follow_x += int(momx * j);
+			follow_y += int(momy * j);
 
 			if (x_min_bound == INT_MAX) CalcMapBounds();
 			follow_x = clamp(follow_x, x_min_bound, x_max_bound);