diff --git a/src/PlanView/MissionSettingsEditor.qml b/src/PlanView/MissionSettingsEditor.qml
index cde3ac00fab5f18cb115170ffb0d455aa035f81e..28c15bf353bc6cca3edf34b74f7248e95cc5fc22 100644
--- a/src/PlanView/MissionSettingsEditor.qml
+++ b/src/PlanView/MissionSettingsEditor.qml
@@ -20,21 +20,22 @@ Rectangle {
     visible:            missionItem.isCurrentItem
     radius:             _radius
 
-    property var    _masterControler:           masterController
-    property var    _missionController:         _masterControler.missionController
-    property var    _missionVehicle:            _masterControler.controllerVehicle
-    property bool   _vehicleHasHomePosition:    _missionVehicle.homePosition.isValid
-    property bool   _offlineEditing:            _missionVehicle.isOfflineEditingVehicle
-    property bool   _showOfflineVehicleCombos:  _offlineEditing && _multipleFirmware && _noMissionItemsAdded
-    property bool   _showCruiseSpeed:           !_missionVehicle.multiRotor
-    property bool   _showHoverSpeed:            _missionVehicle.multiRotor || _missionVehicle.vtol
-    property bool   _multipleFirmware:          QGroundControl.supportedFirmwareCount > 2
-    property real   _fieldWidth:                ScreenTools.defaultFontPixelWidth * 16
-    property bool   _mobile:                    ScreenTools.isMobile
-    property var    _savePath:                  QGroundControl.settingsManager.appSettings.missionSavePath
-    property var    _fileExtension:             QGroundControl.settingsManager.appSettings.missionFileExtension
-    property var    _appSettings:               QGroundControl.settingsManager.appSettings    
-    property bool   _waypointsOnlyMode:         QGroundControl.corePlugin.options.missionWaypointsOnly
+    property var    _masterControler:               masterController
+    property var    _missionController:             _masterControler.missionController
+    property var    _missionVehicle:                _masterControler.controllerVehicle
+    property bool   _vehicleHasHomePosition:        _missionVehicle.homePosition.isValid
+    property bool   _offlineEditing:                _missionVehicle.isOfflineEditingVehicle
+    property bool   _showOfflineVehicleCombos:      _multipleFirmware
+    property bool   _enableOfflineVehicleCombos:    _offlineEditing && _noMissionItemsAdded
+    property bool   _showCruiseSpeed:               !_missionVehicle.multiRotor
+    property bool   _showHoverSpeed:                _missionVehicle.multiRotor || _missionVehicle.vtol
+    property bool   _multipleFirmware:              QGroundControl.supportedFirmwareCount > 2
+    property real   _fieldWidth:                    ScreenTools.defaultFontPixelWidth * 16
+    property bool   _mobile:                        ScreenTools.isMobile
+    property var    _savePath:                      QGroundControl.settingsManager.appSettings.missionSavePath
+    property var    _fileExtension:                 QGroundControl.settingsManager.appSettings.missionFileExtension
+    property var    _appSettings:                   QGroundControl.settingsManager.appSettings
+    property bool   _waypointsOnlyMode:             QGroundControl.corePlugin.options.missionWaypointsOnly
 
     readonly property string _firmwareLabel:    qsTr("Firmware")
     readonly property string _vehicleLabel:     qsTr("Vehicle")
@@ -162,6 +163,7 @@ Rectangle {
                     indexModel:             false
                     Layout.preferredWidth:  _fieldWidth
                     visible:                _showOfflineVehicleCombos
+                    enabled:                _enableOfflineVehicleCombos
                 }
 
                 QGCLabel {
@@ -174,6 +176,7 @@ Rectangle {
                     indexModel:             false
                     Layout.preferredWidth:  _fieldWidth
                     visible:                _showOfflineVehicleCombos
+                    enabled:                _enableOfflineVehicleCombos
                 }
 
                 QGCLabel {