diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index 3d85f365e7afd8960fae22d62fe8770ba8355eb5..c5124d90124242e374e15f16f37342f5f69253ee 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -253,6 +253,8 @@
src/QmlControls/QGCCheckBox.qml
src/QmlControls/QGCLabel.qml
src/QmlControls/QGCTextField.qml
+ src/QmlControls/QGCComboBox.qml
+
src/QmlControls/arrow-down.png
files/images/px4/airframes/octo_x.png
diff --git a/src/QmlControls/QGCComboBox.qml b/src/QmlControls/QGCComboBox.qml
new file mode 100644
index 0000000000000000000000000000000000000000..d3d3d260ded2c2434bf22fbf89441315ac42b74d
--- /dev/null
+++ b/src/QmlControls/QGCComboBox.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.2
+import QtQuick.Controls 1.2
+import QtQuick.Controls.Styles 1.2
+
+import QGroundControl.Palette 1.0
+
+ComboBox {
+ property var __palette: QGCPalette { colorGroupEnabled: enabled }
+
+}
diff --git a/src/QmlControls/QmlTest.qml b/src/QmlControls/QmlTest.qml
index f3581bca44d4be8ffb32f6194e32b3591a408be5..a028caa6a2b528a935ca91b1be81e61912fe22ab 100644
--- a/src/QmlControls/QmlTest.qml
+++ b/src/QmlControls/QmlTest.qml
@@ -498,6 +498,23 @@ Rectangle {
enabled: false
}
+ // QGCComboBox
+ Loader {
+ sourceComponent: ctlRowHeader
+ property var text: "QGCComboBox"
+ }
+ QGCComboBox {
+ width: 100
+ height: 20
+ model: [ "Item 1", "Item 2", "Item 3" ]
+ }
+ QGCComboBox {
+ width: 100
+ height: 20
+ model: [ "Item 1", "Item 2", "Item 3" ]
+ enabled: false
+ }
+
// SubMenuButton
Loader {
sourceComponent: ctlRowHeader
diff --git a/src/QmlControls/qmldir b/src/QmlControls/qmldir
index a68d54fb56648ff6a9068c3dd2bb9b92a3c941ce..9342c160e6042771ffef3bdd4723eefeae5fe367 100644
--- a/src/QmlControls/qmldir
+++ b/src/QmlControls/qmldir
@@ -5,3 +5,4 @@ QGCButton 1.0 QGCButton.qml
QGCRadioButton 1.0 QGCRadioButton.qml
QGCCheckBox 1.0 QGCCheckBox.qml
QGCTextField 1.0 QGCTextField.qml
+QGCComboBox 1.0 QGCComboBox.qml