diff --git a/OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs b/OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs
index 45eb7c2f06..539fb0a466 100755
--- a/OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs
+++ b/OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs
@@ -152,7 +152,7 @@ namespace OpenRA.Widgets
                 if (Keyboard.Includes(ScrollDirection.Left) || Edge.Includes(ScrollDirection.Left))
                     scroll += new float2(-1, 0);
 
-				float length = scroll.Length;
+				float length = Math.Max(1, scroll.Length);
 				scroll.X = (scroll.X / length) * Game.Settings.Game.ViewportEdgeScrollStep;
 				scroll.Y = (scroll.Y / length) * Game.Settings.Game.ViewportEdgeScrollStep;