diff --git a/src/FirmwarePlugin/FirmwarePlugin.cc b/src/FirmwarePlugin/FirmwarePlugin.cc
index 6638f8b23af4c2913ba11110c387761575ebbc6b..c09cf30f5620d77f76ee0bc44ed779c1bf706d6d 100644
--- a/src/FirmwarePlugin/FirmwarePlugin.cc
+++ b/src/FirmwarePlugin/FirmwarePlugin.cc
@@ -323,16 +323,16 @@ const QVariantList &FirmwarePlugin::toolBarIndicators(const Vehicle* vehicle)
     //-- Default list of indicators for all vehicles.
     if(_toolBarIndicatorList.size() == 0) {
         _toolBarIndicatorList = QVariantList({
-            QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/MultiVehicleSelector.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/MessageIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/GPSIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/TelemetryRSSIIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/RCRSSIIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/BatteryIndicator.qml")),
+            QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/GPSRTKIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/ModeIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/VTOLModeIndicator.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/ArmedIndicator.qml")),
-            QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/GPSRTKIndicator.qml")),
+            QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/MultiVehicleSelector.qml")),
             QVariant::fromValue(QUrl::fromUserInput("qrc:/toolbar/LinkIndicator.qml")),
         });
     }
diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index 5a8c378916f1a2e71deeeb8c0132c1c1124dd769..ac4b35bdf84adb9e64c60c464b052be4b67e1670 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -31,11 +31,6 @@ FlightMap {
     allowVehicleLocationCenter: !_keepVehicleCentered
     planView:                   false
 
-    onVisibleChanged: {
-        // I don't know what is causing this to become invisible when a connection is dropped
-        if(!visible) visible = true
-    }
-
     property alias  scaleState: mapScale.state
 
     // The following properties must be set by the consumer
@@ -190,7 +185,7 @@ FlightMap {
         line.width: 3
         line.color: "red"
         z:          QGroundControl.zOrderTrajectoryLines
-        visible:    true//mainIsMap
+        visible:    mainIsMap
 
         Connections {
             target:                 QGroundControl.multiVehicleManager
@@ -320,9 +315,9 @@ FlightMap {
         property bool inGotoFlightMode: activeVehicle ? activeVehicle.flightMode === activeVehicle.gotoFlightMode : false
 
         onInGotoFlightModeChanged: {
-            if (!inGotoFlightMode && visible) {
+            if (!inGotoFlightMode && gotoLocationItem.visible) {
                 // Hide goto indicator when vehicle falls out of guided mode
-                visible = false
+                gotoLocationItem.visible = false
             }
         }
 
@@ -330,7 +325,7 @@ FlightMap {
             target: mainWindow
             onActiveVehicleChanged: {
                 if (!activeVehicle) {
-                    visible = false
+                    gotoLocationItem.visible = false
                 }
             }
         }
@@ -368,7 +363,7 @@ FlightMap {
             target: mainWindow
             onActiveVehicleChanged: {
                 if (!activeVehicle) {
-                    visible = false
+                    orbitMapCircle.visible = false
                 }
             }
         }
diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml
index 0d12bf021891d28b018b56dd4434a77dec1d81c7..3560ae320e195dfa72c6289edcca6e3155eed465 100644
--- a/src/ui/toolbar/MainToolBar.qml
+++ b/src/ui/toolbar/MainToolBar.qml
@@ -50,7 +50,7 @@ Item {
         anchors.bottomMargin:   1
         anchors.rightMargin:    ScreenTools.defaultFontPixelWidth / 2
         anchors.fill:           parent
-        spacing:                ScreenTools.defaultFontPixelWidth * 2
+        spacing:                ScreenTools.defaultFontPixelWidth / 2
 
         ButtonGroup {
             buttons:            viewRow.children
diff --git a/src/ui/toolbar/MultiVehicleSelector.qml b/src/ui/toolbar/MultiVehicleSelector.qml
index 5937e9f62b9e8887ca10d57e8ccded0d6e9609de..36b8e52bcae80373cb5cb27926ecd25929a77dd8 100644
--- a/src/ui/toolbar/MultiVehicleSelector.qml
+++ b/src/ui/toolbar/MultiVehicleSelector.qml
@@ -18,61 +18,49 @@ import QGroundControl.ScreenTools           1.0
 import QGroundControl.Palette               1.0
 
 //-------------------------------------------------------------------------
-//-- Mode Indicator
-Item {
+//-- Multiple Vehicle Selector
+QGCComboBox {
     anchors.top:    parent.top
     anchors.bottom: parent.bottom
-    visible:        _multiVehicles
-    width:          _multiVehicles ? multiVehicleSelector.width : 0
+    font.pointSize: ScreenTools.mediumFontPointSize
+    currentIndex:   -1
+    sizeToContents: true
+    model:          _vehicleModel
+    visible:        _multipleVehicles
 
-    property bool _multiVehicles:  activeVehicle ? QGroundControl.multiVehicleManager.vehicles.count > 1 : false
+    property var    _activeVehicle:     QGroundControl.multiVehicleManager.activeVehicle
+    property bool   _multipleVehicles:  _activeVehicle ? QGroundControl.multiVehicleManager.vehicles.count > 1 : false
+    property var    _vehicleModel:      [ ]
 
     Connections {
         target:         QGroundControl.multiVehicleManager.vehicles
-        onCountChanged: multiVehicleSelector.updatemultiVehiclesMenu()
+        onCountChanged:  _updateVehicleModel()
     }
 
-    QGCLabel {
-        id:                     multiVehicleSelector
-        text:                   "Vehicle " + (activeVehicle ? activeVehicle.id : "None")
-        font.pointSize:         ScreenTools.mediumFontPointSize
-        color:                  qgcPal.buttonText
-        anchors.verticalCenter: parent.verticalCenter
-        QGCMenu {
-            id: multiVehiclesMenu
-        }
-        Component {
-            id: multiVehicleMenuItemComponent
-            QGCMenuItem {
-                onTriggered: QGroundControl.multiVehicleManager.activeVehicle = vehicle
-                property int vehicleId: Number(text.split(" ")[1])
-                property var vehicle:   QGroundControl.multiVehicleManager.getVehicleById(vehicleId)
-            }
-        }
-        property var multiVehiclesMenuItems: []
-        function updatemultiVehiclesMenu() {
-            if (_multiVehicles) {
-                // Remove old menu items
-                for (var i = 0; i < multiVehiclesMenuItems.length; i++) {
-                    multiVehiclesMenu.removeItem(multiVehiclesMenuItems[i])
-                }
-                multiVehiclesMenuItems.length = 0
-                // Add new items
-                for (i = 0; i < QGroundControl.multiVehicleManager.vehicles.count; i++) {
-                    var vehicle = QGroundControl.multiVehicleManager.vehicles.get(i)
-                    var menuItem = multiVehicleMenuItemComponent.createObject(null, { "text": "Vehicle " + vehicle.id })
-                    multiVehiclesMenuItems.push(menuItem)
-                    multiVehiclesMenu.insertItem(i, menuItem)
+    Component.onCompleted: _updateVehicleModel()
+
+    function _updateVehicleModel() {
+        var newCurrentIndex = -1
+        var newModel = [ ]
+        if (_multipleVehicles) {
+            for (var i = 0; i < QGroundControl.multiVehicleManager.vehicles.count; i++) {
+                var vehicle = QGroundControl.multiVehicleManager.vehicles.get(i)
+                newModel.push(qsTr("Vehicle") + " " + vehicle.id)
+
+                if (vehicle.id === _activeVehicle.id) {
+                    newCurrentIndex = i
                 }
             }
         }
-        Component.onCompleted: {
-            multiVehicleSelector.updatemultiVehiclesMenu()
-        }
+        currentIndex = -1
+        _vehicleModel = newModel
+        currentIndex = newCurrentIndex
     }
-    MouseArea {
-        visible:        _multiVehicles
-        anchors.fill:   parent
-        onClicked:      multiVehiclesMenu.popup()
+
+    onActivated: {
+        var vehicleId = textAt(index).split(" ")[1]
+        var vehicle = QGroundControl.multiVehicleManager.getVehicleById(vehicleId)
+        QGroundControl.multiVehicleManager.activeVehicle = vehicle
     }
 }
+