diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs
index 21fefdf23d..c738fbee2d 100644
--- a/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs
+++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.Designer.cs
@@ -44,6 +44,7 @@
 			this.buttonLoadDefaults = new System.Windows.Forms.Button();
 			this.buttonSaveDefaults = new System.Windows.Forms.Button();
 			this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
 			this.tabControl1.SuspendLayout();
 			this.tableLayoutPanel1.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -176,23 +177,27 @@
 			// 
 			// buttonLoadDefaults
 			// 
-			this.buttonLoadDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.buttonLoadDefaults.Location = new System.Drawing.Point(683, 514);
+			this.buttonLoadDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.buttonLoadDefaults.Location = new System.Drawing.Point(465, 514);
 			this.buttonLoadDefaults.Name = "buttonLoadDefaults";
 			this.buttonLoadDefaults.Size = new System.Drawing.Size(75, 23);
 			this.buttonLoadDefaults.TabIndex = 8;
 			this.buttonLoadDefaults.Text = "Defaults";
+			this.toolTip1.SetToolTip(this.buttonLoadDefaults, "Set the default controller configuration to the current.  Note: this affects all " +
+        "controllers!");
 			this.buttonLoadDefaults.UseVisualStyleBackColor = true;
 			this.buttonLoadDefaults.Click += new System.EventHandler(this.ButtonLoadDefaults_Click);
 			// 
 			// buttonSaveDefaults
 			// 
-			this.buttonSaveDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.buttonSaveDefaults.Location = new System.Drawing.Point(602, 514);
+			this.buttonSaveDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.buttonSaveDefaults.Location = new System.Drawing.Point(384, 514);
 			this.buttonSaveDefaults.Name = "buttonSaveDefaults";
 			this.buttonSaveDefaults.Size = new System.Drawing.Size(75, 23);
 			this.buttonSaveDefaults.TabIndex = 9;
 			this.buttonSaveDefaults.Text = "Save Defs";
+			this.toolTip1.SetToolTip(this.buttonSaveDefaults, "Save the current configuration as your default controls. Note: this saves ALL con" +
+        "troller information!");
 			this.buttonSaveDefaults.UseVisualStyleBackColor = true;
 			this.buttonSaveDefaults.Click += new System.EventHandler(this.ButtonSaveDefaults_Click);
 			// 
@@ -245,5 +250,6 @@
 		private System.Windows.Forms.TabPage tabPage3;
 		private System.Windows.Forms.Button buttonSaveDefaults;
 		private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+		private System.Windows.Forms.ToolTip toolTip1;
 	}
 }
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
index a22f69b2c1..095a5875b3 100644
--- a/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
+++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
@@ -153,11 +153,6 @@ namespace BizHawk.Client.EmuHawk
 
 			SetControllerPicture(def.Name);
 
-			if (!VersionInfo.INTERIM)
-			{
-				buttonSaveDefaults.Hide();
-			}
-
 			ResumeLayout();
 		}
 
diff --git a/BizHawk.Client.EmuHawk/config/ControllerConfig.resx b/BizHawk.Client.EmuHawk/config/ControllerConfig.resx
index 464d8ff468..670e3a2375 100644
--- a/BizHawk.Client.EmuHawk/config/ControllerConfig.resx
+++ b/BizHawk.Client.EmuHawk/config/ControllerConfig.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>172, 17</value>
+  </metadata>
   <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>