diff --git a/HandheldCompanion/Controllers/DInputController.cs b/HandheldCompanion/Controllers/DInputController.cs
index 966bcb580..9a91c0db2 100644
--- a/HandheldCompanion/Controllers/DInputController.cs
+++ b/HandheldCompanion/Controllers/DInputController.cs
@@ -1,4 +1,5 @@
-using SharpDX.DirectInput;
+using HandheldCompanion.Inputs;
+using SharpDX.DirectInput;
 
 namespace HandheldCompanion.Controllers;
 
@@ -31,6 +32,9 @@ public DInputController(Joystick joystick, PnPDetails details)
         // UI
         DrawUI();
         UpdateUI();
+
+        // Additional controller specific target buttons
+        TargetButtons.Add(ButtonFlags.LeftPadClick);
     }
 
     public override string ToString()
@@ -69,4 +73,4 @@ public override void Unplug()
 
         base.Unplug();
     }
-}
\ No newline at end of file
+}
diff --git a/HandheldCompanion/Controllers/DS4Controller.cs b/HandheldCompanion/Controllers/DS4Controller.cs
index a081322cf..00c9da515 100644
--- a/HandheldCompanion/Controllers/DS4Controller.cs
+++ b/HandheldCompanion/Controllers/DS4Controller.cs
@@ -31,6 +31,7 @@ public DS4Controller(JOY_SETTINGS settings, PnPDetails details) : base(settings,
         SourceAxis.Add(AxisLayoutFlags.RightPad);
         SourceAxis.Add(AxisLayoutFlags.Gyroscope);
 
+        // Additional controller specific target buttons
         TargetButtons.Add(ButtonFlags.LeftPadClick);
         TargetButtons.Add(ButtonFlags.LeftPadTouch);
         TargetButtons.Add(ButtonFlags.RightPadTouch);
@@ -180,4 +181,4 @@ public override string GetGlyph(AxisLayoutFlags axis)
 
         return base.GetGlyph(axis);
     }
-}
\ No newline at end of file
+}
diff --git a/HandheldCompanion/Controllers/DualSenseController.cs b/HandheldCompanion/Controllers/DualSenseController.cs
index f23bb9eba..0ebae24f5 100644
--- a/HandheldCompanion/Controllers/DualSenseController.cs
+++ b/HandheldCompanion/Controllers/DualSenseController.cs
@@ -24,6 +24,7 @@ public DualSenseController(JOY_SETTINGS settings, PnPDetails details) : base(set
         SourceAxis.Add(AxisLayoutFlags.RightPad);
         SourceAxis.Add(AxisLayoutFlags.Gyroscope);
 
+        // Additional controller specific target buttons
         TargetButtons.Add(ButtonFlags.LeftPadClick);
         TargetButtons.Add(ButtonFlags.LeftPadTouch);
         TargetButtons.Add(ButtonFlags.RightPadTouch);
@@ -173,4 +174,4 @@ public override string GetGlyph(AxisLayoutFlags axis)
 
         return base.GetGlyph(axis);
     }
-}
\ No newline at end of file
+}
diff --git a/HandheldCompanion/Controllers/GordonController.cs b/HandheldCompanion/Controllers/GordonController.cs
index 14dcdac54..7e06f49e9 100644
--- a/HandheldCompanion/Controllers/GordonController.cs
+++ b/HandheldCompanion/Controllers/GordonController.cs
@@ -42,6 +42,7 @@ public GordonController(PnPDetails details) : base()
             SourceAxis.Add(AxisLayoutFlags.RightPad);
             SourceAxis.Add(AxisLayoutFlags.Gyroscope);
 
+            // Additional controller specific target buttons
             TargetButtons.Add(ButtonFlags.LeftPadClick);
             TargetButtons.Add(ButtonFlags.RightPadClick);
             TargetButtons.Add(ButtonFlags.LeftPadTouch);
@@ -308,4 +309,4 @@ public override void SetHaptic(HapticStrength strength, ButtonFlags button)
             Controller.SetHaptic((byte)GetMotorForButton(button), value, 0, 1);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/HandheldCompanion/Controllers/NeptuneController.cs b/HandheldCompanion/Controllers/NeptuneController.cs
index 412f41153..3b01c3f77 100644
--- a/HandheldCompanion/Controllers/NeptuneController.cs
+++ b/HandheldCompanion/Controllers/NeptuneController.cs
@@ -55,6 +55,7 @@ public NeptuneController(PnPDetails details) : base()
         SourceAxis.Add(AxisLayoutFlags.RightPad);
         SourceAxis.Add(AxisLayoutFlags.Gyroscope);
 
+        // Additional controller specific target buttons
         TargetButtons.Add(ButtonFlags.LeftPadClick);
         TargetButtons.Add(ButtonFlags.RightPadClick);
         TargetButtons.Add(ButtonFlags.LeftPadTouch);
@@ -394,4 +395,4 @@ public override void SetHaptic(HapticStrength strength, ButtonFlags button)
         };
         Controller.SetHaptic((byte)GetMotorForButton(button), value, 0, 1);
     }
-}
\ No newline at end of file
+}
diff --git a/HandheldCompanion/Controllers/ProController.cs b/HandheldCompanion/Controllers/ProController.cs
index e3d9b08d9..5aaac436f 100644
--- a/HandheldCompanion/Controllers/ProController.cs
+++ b/HandheldCompanion/Controllers/ProController.cs
@@ -16,6 +16,9 @@ public ProController(JOY_SETTINGS settings, PnPDetails details) : base(settings,
         // Additional controller specific source buttons
         SourceButtons.Add(ButtonFlags.Special2);
         SourceAxis.Add(AxisLayoutFlags.Gyroscope);
+
+        // Additional controller specific target buttons
+        TargetButtons.Add(ButtonFlags.LeftPadClick);
     }
 
     public override void UpdateInputs(long ticks)
@@ -115,4 +118,4 @@ public override string GetGlyph(AxisLayoutFlags axis)
 
         return base.GetGlyph(axis);
     }
-}
\ No newline at end of file
+}
diff --git a/HandheldCompanion/Controllers/XInputController.cs b/HandheldCompanion/Controllers/XInputController.cs
index 819c718c3..16faba0fe 100644
--- a/HandheldCompanion/Controllers/XInputController.cs
+++ b/HandheldCompanion/Controllers/XInputController.cs
@@ -33,6 +33,9 @@ public XInputController(PnPDetails details)
         DrawUI();
         UpdateUI();
 
+        // Additional controller specific target buttons
+        TargetButtons.Add(ButtonFlags.LeftPadClick);
+
         string enumerator = Details.GetEnumerator();
         switch (enumerator)
         {