diff --git a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
index 7a40d669d12ab11618079e4f7c058dfd4393d588..06907c2f42f1fbd8558f47409fc9d13ad09bad27 100644
--- a/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
+++ b/src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
@@ -81,52 +81,49 @@ Item {
                         height:             flightModeColumn.height + ScreenTools.defaultFontPixelHeight
                         color:              qgcPal.windowShade
 
-                        ColumnLayout {
+                        GridLayout {
                             id:                 flightModeColumn
                             anchors.margins:    ScreenTools.defaultFontPixelWidth
                             anchors.left:       parent.left
                             anchors.top:        parent.top
-                            spacing:            ScreenTools.defaultFontPixelHeight
+                            rows:               7
+                            rowSpacing:         ScreenTools.defaultFontPixelWidth / 2
+                            columnSpacing:      rowSpacing
+                            flow:               GridLayout.TopToBottom
 
-                            RowLayout {
+                            QGCLabel {
                                 Layout.fillWidth:   true
-                                spacing:            _margins
+                                text:               qsTr("Mode Channel")
+                            }
+
+                            Repeater {
+                                model:  6
 
                                 QGCLabel {
                                     Layout.fillWidth:   true
-                                    text:               qsTr("Mode channel:")
+                                    text:               qsTr("Flight Mode %1").arg(modelData + 1)
+                                    color:              controller.activeFlightMode == index ? "yellow" : qgcPal.text
                                 }
+                            }
 
-                                FactComboBox {
-                                    Layout.preferredWidth:  _channelComboWidth
-                                    fact:                   controller.getParameterFact(-1, "RC_MAP_FLTMODE")
-                                    indexModel:             false
-                                }
+                            FactComboBox {
+                                Layout.fillWidth:   true
+                                fact:               controller.getParameterFact(-1, "RC_MAP_FLTMODE")
+                                indexModel:         false
+                                sizeToContents:     true
                             }
 
                             Repeater {
                                 model:  6
 
-                                RowLayout {
+                                FactComboBox {
                                     Layout.fillWidth:   true
-                                    spacing:            ScreenTools.defaultFontPixelWidth
-
-                                    property int index:         modelData + 1
-
-                                    QGCLabel {
-                                        Layout.fillWidth:   true
-                                        text:               qsTr("Flight Mode %1").arg(index)
-                                        color:              controller.activeFlightMode == index ? "yellow" : qgcPal.text
-                                    }
-
-                                    FactComboBox {
-                                        Layout.preferredWidth:  _channelComboWidth
-                                        fact:                   controller.getParameterFact(-1, "COM_FLTMODE" + index)
-                                        indexModel:             false
-                                    }
+                                    fact:               controller.getParameterFact(-1, "COM_FLTMODE" + (modelData + 1))
+                                    indexModel:         false
+                                    sizeToContents:     true
                                 }
-                            } // Repeater - Flight Modes
-                        } // Column - Flight Modes
+                            }
+                        }
                     } // Rectangle - Flight Modes
                 } // Column - Flight mode settings