diff --git a/src/AutoPilotPlugins/APM/APMCameraComponent.qml b/src/AutoPilotPlugins/APM/APMCameraComponent.qml
index 0c623cd2954a93322d6888d20c7b278728303545..124eae22a9d6a222bb4cf9d1aa6f701855052215 100644
--- a/src/AutoPilotPlugins/APM/APMCameraComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMCameraComponent.qml
@@ -272,6 +272,7 @@ SetupPage {
                             anchors.left:       gimbalOutLabel.right
                             width:              mountAngMinField.width
                             model:              gimbalOutModel
+                            textRole:           "text"
                             currentIndex:       gimbalOutIndex
 
                             onActivated: setRCFunction(gimbalOutModel.get(index).value, rcFunction)
diff --git a/src/AutoPilotPlugins/APM/APMCameraSubComponent.qml b/src/AutoPilotPlugins/APM/APMCameraSubComponent.qml
index 20916fa90a340e68a65f75715f9481c0142c80e0..ebc009462e766742a66669fc8cb6fcc24c33140a 100644
--- a/src/AutoPilotPlugins/APM/APMCameraSubComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMCameraSubComponent.qml
@@ -316,10 +316,11 @@ SetupPage {
                                             }
 
                                             QGCComboBox {
-                                                id:           outputChan
-                                                width:        servoPWMMinField.width
-                                                model:        gimbalOutModel
-                                                currentIndex: gimbalOutIndex
+                                                id:             outputChan
+                                                width:          servoPWMMinField.width
+                                                model:          gimbalOutModel
+                                                textRole:       "text"
+                                                currentIndex:   gimbalOutIndex
 
                                                 onActivated: setRCFunction(gimbalOutModel.get(index).value, rcFunction)
                                             }
diff --git a/src/AutoPilotPlugins/APM/APMLightsComponent.qml b/src/AutoPilotPlugins/APM/APMLightsComponent.qml
index d56e5fa91eb3c8f5af91a9b2d9d58d06cadbf78f..acc76671a7b87e4709032b9ed79a869a5163df6a 100644
--- a/src/AutoPilotPlugins/APM/APMLightsComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMLightsComponent.qml
@@ -191,6 +191,7 @@ SetupPage {
                             anchors.left:       lightsStepLabel.right
                             width:              ScreenTools.defaultFontPixelWidth * 15
                             model:              lightsOutModel
+                            textRole:           "text"
                             currentIndex:       lights1OutIndex
 
                             onActivated: setRCFunction(lightsOutModel.get(index).value, lights1Function)
@@ -211,6 +212,7 @@ SetupPage {
                             anchors.left:       lightsStepLabel.right
                             width:              lights1Combo.width
                             model:              lightsOutModel
+                            textRole:           "text"
                             currentIndex:       lights2OutIndex
 
                             onActivated: setRCFunction(lightsOutModel.get(index).value, lights2Function)
diff --git a/src/AutoPilotPlugins/APM/APMPowerComponent.qml b/src/AutoPilotPlugins/APM/APMPowerComponent.qml
index 1a4e153fc4bd346d0485a3cbaa3da5d4929426cd..7e3e240f13ed551fecb616eddaec9a35ccadb972 100644
--- a/src/AutoPilotPlugins/APM/APMPowerComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMPowerComponent.qml
@@ -398,6 +398,7 @@ SetupPage {
                     id:                     sensorCombo
                     Layout.minimumWidth:    _fieldWidth
                     model:                  sensorModel
+                    textRole:               "text"
 
                     onActivated: {
                         if (index < sensorModel.count - 1) {
diff --git a/src/QmlControls/PIDTuning.qml b/src/QmlControls/PIDTuning.qml
index 614af00691c9c3f79a6746dfa327e6718c1e5eb9..59643ce68426b1e2d7d1b176a8db4e7bd2e4ed52 100644
--- a/src/QmlControls/PIDTuning.qml
+++ b/src/QmlControls/PIDTuning.qml
@@ -303,7 +303,8 @@ RowLayout {
             QGCLabel { text: qsTr("Increment/Decrement %") }
 
             QGCComboBox {
-                id:     adjustPercentCombo
+                id:         adjustPercentCombo
+                textRole:   "text"
                 model:  ListModel {
                     id: adjustPercentModel
                     ListElement { text: "5"; value: 0.05 }
diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml
index 1a257f8e5d860a1725dddd5a028249b059b12c9e..95937877803a7462e3fb3a0ca2a814e2c21dfe4f 100644
--- a/src/VehicleSetup/FirmwareUpgrade.qml
+++ b/src/VehicleSetup/FirmwareUpgrade.qml
@@ -409,6 +409,7 @@ SetupPage {
                                 anchors.right:  parent.right
                                 visible:        px4Flow
                                 model:          px4FlowFirmwareList
+                                textRole:       "text"
                                 currentIndex:   _defaultFirmwareIsPX4 ? 0 : 1
                             }
 
diff --git a/src/ui/preferences/MavlinkSettings.qml b/src/ui/preferences/MavlinkSettings.qml
index 319a0cc3228dfdee1d61f643e20e639149edf730..63ae81721717c1b005da2576a9957ac25f29122b 100644
--- a/src/ui/preferences/MavlinkSettings.qml
+++ b/src/ui/preferences/MavlinkSettings.qml
@@ -513,6 +513,7 @@ Rectangle {
                             id:         windCombo
                             width:      _valueWidth
                             enabled:    !_disableDataPersistence
+                            textRole:   "text"
                             model: ListModel {
                                 id: windItems
                                 ListElement { text: "Please Select"; value: -1 }
@@ -550,6 +551,7 @@ Rectangle {
                             id:         ratingCombo
                             width:      _valueWidth
                             enabled:    !_disableDataPersistence
+                            textRole:   "text"
                             model: ListModel {
                                 id: ratingItems
                                 ListElement { text: "Please Select";            value: "notset"}