diff --git a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindPanel.cs b/BizHawk.MultiClient/config/ControllerConfig/AnalogBindPanel.cs
index c2317034fd..9ab2b5bc05 100644
--- a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindPanel.cs
+++ b/BizHawk.MultiClient/config/ControllerConfig/AnalogBindPanel.cs
@@ -29,8 +29,6 @@ namespace BizHawk.MultiClient.config.ControllerConfig
 				var ctrl = new AnalogBindControl(ButtonName, RealConfigObject[ButtonName]);
 				ctrl.Location = new Point(x, y);
 				y += ctrl.Height + 4;
-				if (Width < ctrl.Width + 8)
-					Width = ctrl.Width + 8;
 				Controls.Add(ctrl);
 			}
 			ResumeLayout();
diff --git a/BizHawk.MultiClient/config/NewControllerConfig.cs b/BizHawk.MultiClient/config/NewControllerConfig.cs
index 1a550161a4..caa9deaeda 100644
--- a/BizHawk.MultiClient/config/NewControllerConfig.cs
+++ b/BizHawk.MultiClient/config/NewControllerConfig.cs
@@ -51,7 +51,7 @@ namespace BizHawk.MultiClient.config
 
 		Control CreateAnalogPanel(Dictionary<string, Config.AnalogBind> settings, List<string> buttons, Size size)
 		{
-			var acp = new AnalogBindPanel(settings, buttons);
+			var acp = new AnalogBindPanel(settings, buttons) { Dock = DockStyle.Fill };
 			return acp;
 		}