diff --git a/src/BizHawk.Client.Common/inputAdapters/InputManager.cs b/src/BizHawk.Client.Common/inputAdapters/InputManager.cs
index c3594c77be..860ddddbb3 100644
--- a/src/BizHawk.Client.Common/inputAdapters/InputManager.cs
+++ b/src/BizHawk.Client.Common/inputAdapters/InputManager.cs
@@ -73,6 +73,17 @@ namespace BizHawk.Client.Common
 			ControllerOutput.Source = session.MovieOut;
 		}
 
+		public void ToggleStickies()
+		{
+			StickyXorAdapter.MassToggleStickyState(ActiveController.PressedButtons);
+			AutofireStickyXorAdapter.MassToggleStickyState(AutoFireController.PressedButtons);
+		}
+
+		public void ToggleAutoStickies()
+		{
+			AutofireStickyXorAdapter.MassToggleStickyState(ActiveController.PressedButtons);
+		}
+
 		private static Controller BindToDefinition(ControllerDefinition def, IDictionary<string, Dictionary<string, string>> allBinds, IDictionary<string, Dictionary<string, AnalogBind>> analogBinds)
 		{
 			var ret = new Controller(def);
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 91a3d551f1..ad6bf0dda1 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -669,12 +669,11 @@ namespace BizHawk.Client.EmuHawk
 
 				if (InputManager.ClientControls["Autohold"])
 				{
-					InputManager.StickyXorAdapter.MassToggleStickyState(InputManager.ActiveController.PressedButtons);
-					InputManager.AutofireStickyXorAdapter.MassToggleStickyState(InputManager.AutoFireController.PressedButtons);
+					InputManager.ToggleStickies();
 				}
 				else if (InputManager.ClientControls["Autofire"])
 				{
-					InputManager.AutofireStickyXorAdapter.MassToggleStickyState(InputManager.ActiveController.PressedButtons);
+					InputManager.ToggleAutoStickies();
 				}
 
 				// autohold/autofire must not be affected by the following inputs