diff --git a/HandheldCompanion/Controllers/DInputController.cs b/HandheldCompanion/Controllers/DInputController.cs
index 84017509c..76d8c384f 100644
--- a/HandheldCompanion/Controllers/DInputController.cs
+++ b/HandheldCompanion/Controllers/DInputController.cs
@@ -15,7 +15,7 @@ public DInputController(Joystick joystick, PnPDetails details)
             this.joystick = joystick;
             UserIndex = joystick.Properties.JoystickId;
 
-            if (Details is null)
+            if (details is null)
                 return;
 
             Details = details;
diff --git a/HandheldCompanion/Controllers/NeptuneController.cs b/HandheldCompanion/Controllers/NeptuneController.cs
index 5544ea777..4f0a2a20e 100644
--- a/HandheldCompanion/Controllers/NeptuneController.cs
+++ b/HandheldCompanion/Controllers/NeptuneController.cs
@@ -29,7 +29,7 @@ public class NeptuneController : IController
 
         public NeptuneController(PnPDetails details)
         {
-            if (Details is null)
+            if (details is null)
                 return;
 
             Details = details;
diff --git a/HandheldCompanion/Controllers/XInputController.cs b/HandheldCompanion/Controllers/XInputController.cs
index aac83f4bf..4272d8196 100644
--- a/HandheldCompanion/Controllers/XInputController.cs
+++ b/HandheldCompanion/Controllers/XInputController.cs
@@ -159,15 +159,13 @@ public XInputController(Controller controller)
 
                 var devices = DeviceManager.GetDetails(CapabilitiesEx.VendorId, CapabilitiesEx.ProductId);
                 Details = devices.FirstOrDefault();
-
-                if (Details is null)
-                    return;
-
-                Details.isHooked = true;
             }
-            else
+
+            if (Details is null)
                 return;
 
+            Details.isHooked = true;
+
             InputsTimer.Tick += (sender, e) => UpdateInputs();
 
             // UI