diff --git a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs
index 0cfdd5e4f3..4e62052b2f 100644
--- a/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs
+++ b/BizHawk.MultiClient/N64tools/N64VideoPluginconfig.Designer.cs
@@ -2409,6 +2409,7 @@
 			// CancelBT
 			// 
 			this.CancelBT.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.CancelBT.DialogResult = System.Windows.Forms.DialogResult.Cancel;
 			this.CancelBT.Location = new System.Drawing.Point(490, 373);
 			this.CancelBT.Name = "CancelBT";
 			this.CancelBT.Size = new System.Drawing.Size(75, 23);
@@ -2427,8 +2428,10 @@
 			// 
 			// N64VideoPluginconfig
 			// 
+			this.AcceptButton = this.SaveButton;
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = this.CancelBT;
 			this.ClientSize = new System.Drawing.Size(577, 401);
 			this.Controls.Add(this.CancelBT);
 			this.Controls.Add(this.SaveButton);
diff --git a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs
index 9e4331a3a8..d4b9026167 100644
--- a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs
+++ b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs
@@ -96,8 +96,9 @@ namespace BizHawk.MultiClient
 			}
 			else
 			{
+				_panelSize = Size;
 			}
-			_panelSize = Size;
+			
 			RealConfigObject = configobj;
 			RealConfigButtons = configbuttons;
 			SetButtonList();