diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs
index 6435eccb02..0c81da9ba6 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs
@@ -64,6 +64,7 @@ namespace BizHawk.Client.EmuHawk
 				if (_readonly != value)
 				{
 					AnalogTrackBar.Enabled =
+						DisplayNameLabel.Enabled =
 						ValueLabel.Enabled =
 						!value;
 
@@ -166,5 +167,18 @@ namespace BizHawk.Client.EmuHawk
 				Global.StickyXORAdapter.SetFloat(Name, AnalogTrackBar.Value);
 			}
 		}
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			if (!_isSet)
+			{
+				_programmaticallyChangingValue = true;
+				AnalogTrackBar.Value = (int)Global.StickyXORAdapter.GetFloat(Name);
+				ValueLabel.Text = AnalogTrackBar.Value.ToString();
+				_programmaticallyChangingValue = false;
+			}
+
+			base.OnPaint(e);
+		}
 	}
 }