diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.cs
index f562c323c01..089c08056b4 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.cs
@@ -191,6 +191,8 @@ private void SetAnalogControlFromNumerics()
 
 		private void SetNumericsFromAnalog()
 		{
+			_programmaticallyUpdatingNumerics = true;
+
 			if (AnalogStick.HasValue)
 			{
 				// Setting .Value of a numeric causes a draw, so avoid it unless necessary
@@ -225,6 +227,8 @@ private void SetNumericsFromAnalog()
 
 			manualR.ValueChanged += polarNumericChangedEventHandler;
 			manualTheta.ValueChanged += polarNumericChangedEventHandler;
+
+			_programmaticallyUpdatingNumerics = false;
 		}
 
 		private void AnalogStick_MouseDown(object sender, MouseEventArgs e)