diff --git a/src/VehicleSetup/JoystickConfig.qml b/src/VehicleSetup/JoystickConfig.qml
index 4eeeb8cf07fa57cd3e396d5ff396337f6a7ee330..cdaa6b27b941d095176744a3e8b66020a2fe6d38 100644
--- a/src/VehicleSetup/JoystickConfig.qml
+++ b/src/VehicleSetup/JoystickConfig.qml
@@ -343,8 +343,8 @@ QGCView {
 
 
                         QGCCheckBox {
-                            enabled:    _activeJoystick.calibrated
-                            text:       _activeJoystick.calibrated ? qsTr("Enable joystick input") : qsTr("Enable/Disable not allowed (Calibrate First)")
+                            enabled:    checked || _activeJoystick.calibrated
+                            text:       _activeJoystick.calibrated ? qsTr("Enable joystick input") : qsTr("Enable not allowed (Calibrate First)")
                             checked:    _activeVehicle.joystickEnabled
 
                             onClicked:  _activeVehicle.joystickEnabled = checked