diff --git a/BizHawk.Client.Common/config/Binding.cs b/BizHawk.Client.Common/config/Binding.cs
index 7ca0490f20..8153b70222 100644
--- a/BizHawk.Client.Common/config/Binding.cs
+++ b/BizHawk.Client.Common/config/Binding.cs
@@ -151,6 +151,7 @@ namespace BizHawk.Client.Common
 						Bind("General", "Screen Raw to Clipboard", "Ctrl+C"),
 						Bind("General", "Screen Client to Clipboard", "Ctrl+Shift+C"),
 						Bind("General", "Toggle Skip Lag Frame"),
+						Bind("General", "Toggle Key Priority"),
 
 						Bind("Save States", "Save State 0", "Shift+F10"),
 						Bind("Save States", "Save State 1", "Shift+F1"),
diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
index e1de779594..29207ed94b 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
@@ -124,6 +124,9 @@ namespace BizHawk.Client.EmuHawk
 					Global.Config.SkipLagFrame ^= true;
 					GlobalWin.OSD.AddMessage("Skip Lag Frames toggled " + (Global.Config.SkipLagFrame ? "On" : "Off"));
 					break;
+				case "Toggle Key Priority":
+					ToggleKeyPriority();
+					break;
 
 				// Save States
 				case "Save State 0": 
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 0749dbd4b3..884c0e811f 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2679,6 +2679,31 @@ namespace BizHawk.Client.EmuHawk
 			CoreNameStatusBarButton.ToolTipText = attributes.Ported ? "(ported) " : "";
 		}
 
+		private void ToggleKeyPriority()
+		{
+			Global.Config.Input_Hotkey_OverrideOptions++;
+			if (Global.Config.Input_Hotkey_OverrideOptions > 2)
+			{
+				Global.Config.Input_Hotkey_OverrideOptions = 0;
+			}
+
+			UpdateKeyPriorityIcon();
+			switch (Global.Config.Input_Hotkey_OverrideOptions)
+			{
+				default:
+					break;
+				case 0:
+					GlobalWin.OSD.AddMessage("Key priority set to Both Hotkey and Input");
+					break;
+				case 1:
+					GlobalWin.OSD.AddMessage("Key priority set to Input over Hotkey");
+					break;
+				case 2:
+					GlobalWin.OSD.AddMessage("Key priority set to Gamepad");
+					break;
+			}
+		}
+
 		#endregion
 
 		#region Frame Loop