diff --git a/BizHawk.MultiClient/tools/VirtualPadForm.Designer.cs b/BizHawk.MultiClient/tools/VirtualPadForm.Designer.cs
index ee8c21f599..5c00305629 100644
--- a/BizHawk.MultiClient/tools/VirtualPadForm.Designer.cs
+++ b/BizHawk.MultiClient/tools/VirtualPadForm.Designer.cs
@@ -143,7 +143,7 @@
 			this.Controls.Add(this.menuStrip1);
 			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
 			this.MainMenuStrip = this.menuStrip1;
-			this.MinimumSize = new System.Drawing.Size(100, 100);
+			this.MinimumSize = new System.Drawing.Size(400, 100);
 			this.Name = "VirtualPadForm";
 			this.Text = "Virtual Pads";
 			this.Load += new System.EventHandler(this.VirtualPadForm_Load);
diff --git a/BizHawk.MultiClient/tools/VirtualPadForm.cs b/BizHawk.MultiClient/tools/VirtualPadForm.cs
index 04dddad910..a848e4db6d 100644
--- a/BizHawk.MultiClient/tools/VirtualPadForm.cs
+++ b/BizHawk.MultiClient/tools/VirtualPadForm.cs
@@ -195,7 +195,7 @@ namespace BizHawk.MultiClient
 					_ataripad1.Location = new Point(8, 159);
 					_ataripad1.Controller = "P1";
 					VirtualPadA26 _ataripad2 = new VirtualPadA26();
-					_ataripad2.Location = new Point(188, 159);
+					_ataripad2.Location = new Point(218, 159);
 					_ataripad2.Controller = "P2";
 					Pads.Add(_ataripad1);
 					Pads.Add(_ataripad2);
@@ -203,6 +203,16 @@ namespace BizHawk.MultiClient
 					ControllerBox.Controls.Add(_ataripad2);
 					break;
 			}
+
+			//Hack for now
+			if (Global.Emulator.SystemId == "C64")
+			{
+				if (this.Width < 505)
+				{
+					this.Width = 505;
+					ControllerBox.Width = this.Width - 37;
+				}
+			}
 		}
 
 		private void exitToolStripMenuItem_Click(object sender, EventArgs e)