diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml
index c4e739f2c56327a8e43cea57d0a46b766dcd011d..1e4c14e5db460f5e3377dc1297484cc6f567a14b 100644
--- a/src/FlightDisplay/FlightDisplayViewWidgets.qml
+++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml
@@ -61,6 +61,10 @@ Item {
         id: _dropButtonsExclusiveGroup
     }
 
+    ExclusiveGroup {
+        id: _mapTypeButtonsExclusiveGroup
+    }
+
     //-- Map warnings
     Column {
         anchors.horizontalCenter:   parent.horizontalCenter
@@ -217,12 +221,14 @@ Item {
                             model: QGroundControl.flightMapSettings.mapTypes
 
                             QGCButton {
-                                checkable:  true
-                                checked:    _flightMap ? _flightMap.mapType === text : false
-                                text:       modelData
-                                width:      clearButton.width
+                                checkable:      true
+                                checked:        _flightMap ? _flightMap.mapType === text : false
+                                text:               modelData
+                                width:          clearButton.width
+                                exclusiveGroup: _mapTypeButtonsExclusiveGroup
                                 onClicked: {
                                     _flightMap.mapType = text
+                                    checked = true
                                     _dropButtonsExclusiveGroup.current = null
                                 }
                             }