diff --git a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.Designer.cs b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.Designer.cs
index b59ab12123..1654b674fa 100644
--- a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.Designer.cs
+++ b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.Designer.cs
@@ -28,18 +28,41 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
+			this.components = new System.ComponentModel.Container();
+			this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.contextMenuStrip1.SuspendLayout();
 			this.SuspendLayout();
 			// 
+			// contextMenuStrip1
+			// 
+			this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.clearToolStripMenuItem});
+			this.contextMenuStrip1.Name = "contextMenuStrip1";
+			this.contextMenuStrip1.Size = new System.Drawing.Size(102, 26);
+			// 
+			// clearToolStripMenuItem
+			// 
+			this.clearToolStripMenuItem.Name = "clearToolStripMenuItem";
+			this.clearToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.clearToolStripMenuItem.Text = "&Clear";
+			this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click);
+			// 
 			// ControllerConfigPanel
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ContextMenuStrip = this.contextMenuStrip1;
 			this.Name = "ControllerConfigPanel";
 			this.Load += new System.EventHandler(this.ControllerConfigPanel_Load);
+			this.contextMenuStrip1.ResumeLayout(false);
 			this.ResumeLayout(false);
 
 		}
 
 		#endregion
+
+		private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+		private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem;
 	}
 }
diff --git a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs
index cae2099d59..5fccb8a6bc 100644
--- a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs
+++ b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs
@@ -38,6 +38,14 @@ namespace BizHawk.MultiClient
 			
 		}
 
+		public void ClearAll()
+		{
+			foreach (InputWidget i in Inputs)
+			{
+				i.Clear();
+			}
+		}
+
 		public void Save()
 		{
 			for (int button = 0; button < buttons.Count; button++)
@@ -126,5 +134,10 @@ namespace BizHawk.MultiClient
 				i.AutoTab = value;
 			}
 		}
+
+		private void clearToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			ClearAll();
+		}
 	}
 }
diff --git a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.resx b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.resx
index 29dcb1b3a3..661dc11261 100644
--- a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.resx
+++ b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.resx
@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
\ No newline at end of file