diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponent.qml b/src/AutoPilotPlugins/PX4/FlightModesComponent.qml
index d34f6ea2d0a5b13628c7b64bcac0b7beb4fee4f7..12e57a9877566f58a6b0e5e8a8b6a7c07a26cd29 100644
--- a/src/AutoPilotPlugins/PX4/FlightModesComponent.qml
+++ b/src/AutoPilotPlugins/PX4/FlightModesComponent.qml
@@ -136,10 +136,9 @@ QGCView {
         running:    true
 
         onTriggered: {
+            recalcModePositions()
             if (rcInMode.value == 1) {
                 showDialog(joystickEnabledDialogComponent, title, 50, 0)
-            } else {
-                recalcModePositions()
             }
         }
     }