diff --git a/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs b/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs
index 7eb3aa5e59..73e8778a8a 100644
--- a/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs
@@ -315,7 +315,7 @@ namespace OpenRA.Mods.Common.Widgets
 
 				if (mi.Event == MouseInputEvent.Up)
 				{
-					var wasJoystickScrolling = joystickScrollStart.HasValue && joystickScrollEnd.HasValue;
+					var wasJoystickScrolling = IsJoystickScrolling;
 
 					joystickScrollStart = joystickScrollEnd = null;
 					YieldMouseFocus(mi);