diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs
index 6d2b451920..20cb7faf81 100644
--- a/BizHawk.MultiClient/Config.cs
+++ b/BizHawk.MultiClient/Config.cs
@@ -57,6 +57,7 @@ namespace BizHawk.MultiClient
 			ColecoController = new ColecoVisionControllerTemplate(true);
 
 			NESConsoleButtons = new NESConsoleButtonTemplate();
+			SNESConsoleButtons = new NESConsoleButtonTemplate();
 			SMSConsoleButtons = new SMSConsoleButtonTemplate();
 		}
 
@@ -669,6 +670,7 @@ namespace BizHawk.MultiClient
 		//SNES settings
 		public SNESControllerTemplate[] SNESController = new SNESControllerTemplate[4];
 		public SNESControllerTemplate[] SNESAutoController = new SNESControllerTemplate[4];
+		public NESConsoleButtonTemplate SNESConsoleButtons = new NESConsoleButtonTemplate();
 
 		//TI 83 settings
 		public TI83ControllerTemplate[] TI83Controller = new TI83ControllerTemplate[1];
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 454b66a457..ba4049db4f 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -809,6 +809,9 @@ namespace BizHawk.MultiClient
 				snesControls.BindMulti("P" + (i + 1) + " Select", Global.Config.SNESController[i].Select);
 				snesControls.BindMulti("P" + (i + 1) + " Start", Global.Config.SNESController[i].Start);
 			}
+
+			snesControls.BindMulti("Reset", Global.Config.SNESConsoleButtons.Reset);
+			snesControls.BindMulti("Power", Global.Config.SNESConsoleButtons.Power);
 			Global.SNESControls = snesControls;
 
 
diff --git a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs
index 393cd0d580..02f7549581 100644
--- a/BizHawk.MultiClient/config/ControllerConfig.Designer.cs
+++ b/BizHawk.MultiClient/config/ControllerConfig.Designer.cs
@@ -147,6 +147,7 @@
 			this.Atari2600Autofire1Panel = new BizHawk.MultiClient.ControllerConfigPanel();
 			this.Atari2600Autofire2Panel = new BizHawk.MultiClient.ControllerConfigPanel();
 			this.TI83ControllerPanel = new BizHawk.MultiClient.ControllerConfigPanel();
+			this.SNESConsoleButtons = new BizHawk.MultiClient.ControllerConfigPanel();
 			this.tabControl1.SuspendLayout();
 			this.tabPage1.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.ControllerImage)).BeginInit();
@@ -167,6 +168,7 @@
 			this.tabPage23.SuspendLayout();
 			this.tabPage24.SuspendLayout();
 			this.tabPage25.SuspendLayout();
+			this.tabPage26.SuspendLayout();
 			this.tabPage27.SuspendLayout();
 			this.tabPage28.SuspendLayout();
 			this.tabPage29.SuspendLayout();
@@ -460,6 +462,7 @@
 			// 
 			// tabPage26
 			// 
+			this.tabPage26.Controls.Add(this.SNESConsoleButtons);
 			this.tabPage26.Location = new System.Drawing.Point(4, 22);
 			this.tabPage26.Name = "tabPage26";
 			this.tabPage26.Size = new System.Drawing.Size(445, 372);
@@ -1390,6 +1393,13 @@
 			this.TI83ControllerPanel.Size = new System.Drawing.Size(567, 414);
 			this.TI83ControllerPanel.TabIndex = 1;
 			// 
+			// SNESConsoleButtons
+			// 
+			this.SNESConsoleButtons.Location = new System.Drawing.Point(15, 13);
+			this.SNESConsoleButtons.Name = "SNESConsoleButtons";
+			this.SNESConsoleButtons.Size = new System.Drawing.Size(368, 125);
+			this.SNESConsoleButtons.TabIndex = 1;
+			// 
 			// ControllerConfig
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1425,6 +1435,7 @@
 			this.tabPage23.ResumeLayout(false);
 			this.tabPage24.ResumeLayout(false);
 			this.tabPage25.ResumeLayout(false);
+			this.tabPage26.ResumeLayout(false);
 			this.tabPage27.ResumeLayout(false);
 			this.tabPage28.ResumeLayout(false);
 			this.tabPage29.ResumeLayout(false);
@@ -1598,5 +1609,6 @@
 		private BizHawk.MultiClient.ControllerConfigPanel NESConsoleButtons;
 		private ControllerConfigPanel SMSConsoleButtons;
 		private ControllerConfigPanel Atari2600ConsoleButtons;
+		private ControllerConfigPanel SNESConsoleButtons;
 	}
 }
\ No newline at end of file
diff --git a/BizHawk.MultiClient/config/ControllerConfig.cs b/BizHawk.MultiClient/config/ControllerConfig.cs
index e3074a4524..747285a8af 100644
--- a/BizHawk.MultiClient/config/ControllerConfig.cs
+++ b/BizHawk.MultiClient/config/ControllerConfig.cs
@@ -44,6 +44,7 @@ namespace BizHawk.MultiClient
 			SNESController2Panel.LoadSettings(Global.Config.SNESController[1]);
 			SNESController3Panel.LoadSettings(Global.Config.SNESController[2]);
 			SNESController4Panel.LoadSettings(Global.Config.SNESController[3]);
+			SNESConsoleButtons.LoadSettings(Global.Config.SNESConsoleButtons);
 			SNESAutofire1Panel.LoadSettings(Global.Config.SNESAutoController[0]);
 			SNESAutofire2Panel.LoadSettings(Global.Config.SNESAutoController[1]);
 			SNESAutofire3Panel.LoadSettings(Global.Config.SNESAutoController[2]);