diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml
index 8a02e764245623543f28e95fd1770bcba6994233..4b4d8ae9221807c716ca16aef47b78bb6010113c 100644
--- a/src/QmlControls/QGCComboBox.qml
+++ b/src/QmlControls/QGCComboBox.qml
@@ -37,7 +37,7 @@ ComboBox {
             width:                      control.width
 
             contentItem: Text {
-                text:                   textRole ? modelData[textRole] : modelData
+                text:                   control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
                 color:                  control.currentIndex === index ? qgcPal.buttonHighlightText : qgcPal.buttonText
                 verticalAlignment:      Text.AlignVCenter
             }