diff --git a/src/ui/toolbar/MultiVehicleSelector.qml b/src/ui/toolbar/MultiVehicleSelector.qml
index c88a1020d2f3d749c404a3e0c28442b118557fe6..1dea9a5bc118f1a5216b538e779923e92aee6ae7 100644
--- a/src/ui/toolbar/MultiVehicleSelector.qml
+++ b/src/ui/toolbar/MultiVehicleSelector.qml
@@ -29,7 +29,7 @@ QGCComboBox {
     property bool showIndicator: _multipleVehicles
 
     property var    _activeVehicle:     QGroundControl.multiVehicleManager.activeVehicle
-    property bool   _multipleVehicles:  _activeVehicle ? QGroundControl.multiVehicleManager.vehicles.count > 1 : false
+    property bool   _multipleVehicles:  QGroundControl.multiVehicleManager.vehicles.count > 1
     property var    _vehicleModel:      [ ]
 
     Connections {
@@ -37,7 +37,8 @@ QGCComboBox {
         onCountChanged:  _updateVehicleModel()
     }
 
-    Component.onCompleted: _updateVehicleModel()
+    Component.onCompleted:      _updateVehicleModel()
+    on_ActiveVehicleChanged:    _updateVehicleModel()
 
     function _updateVehicleModel() {
         var newCurrentIndex = -1