diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
index 7c838b57db..b4d8f4f1ce 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
@@ -64,13 +64,12 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 						"P" + (i + 1) + " R1",
 						"P" + (i + 1) + " L2",
 						"P" + (i + 1) + " R2",
-						"P" + (i + 1) + " L3",
-						"P" + (i + 1) + " R3",
-						
 					});
 
 					if (_SyncSettings.Controllers[i].Type != ControllerSetting.ControllerType.Gamepad)
 					{
+						ControllerDefinition.BoolButtons.Add("P" + (i + 1) + " L3");
+						ControllerDefinition.BoolButtons.Add("P" + (i + 1) + " R3");
 						ControllerDefinition.BoolButtons.Add("P" + (i + 1) + " MODE");
 
 						ControllerDefinition.FloatControls.AddRange(new[]