diff --git a/src/QmlControls/SubMenuButton.qml b/src/QmlControls/SubMenuButton.qml
index 05533114dbd267df9348abd948e411128d4e2216..4d4538b13205b3f06d330ce2c93b98c89894ec92 100644
--- a/src/QmlControls/SubMenuButton.qml
+++ b/src/QmlControls/SubMenuButton.qml
@@ -13,8 +13,8 @@ Button {
 
     text: "Button"  ///< Pass in your own button text
 
-    checkable:  true
-    height:     ScreenTools.defaultFontPixelHeight * 2.5
+    checkable:      true
+    implicitHeight: ScreenTools.defaultFontPixelHeight * 2.5
 
     style: ButtonStyle {
         id: buttonStyle
@@ -30,6 +30,8 @@ Button {
             id:     innerRect
             color:  showHighlight ? qgcPal.buttonHighlight : qgcPal.windowShade
 
+            implicitWidth: titleBar.x + titleBar.contentWidth + ScreenTools.defaultFontPixelWidth
+
             QGCColoredImage {
                 id:                     image
                 anchors.leftMargin:     ScreenTools.defaultFontPixelWidth
diff --git a/src/VehicleSetup/SetupView.qml b/src/VehicleSetup/SetupView.qml
index 1a782466098b6f24b9072a3d470a4d1decd7f7d3..27e8c33a131e69f4cd1650d530799dba793e4f8b 100644
--- a/src/VehicleSetup/SetupView.qml
+++ b/src/VehicleSetup/SetupView.qml
@@ -213,24 +213,42 @@ Rectangle {
 
         Flickable {
             id:                 buttonScroll
-            width:              mainWindow.menuButtonWidth
+            width:              buttonColumn.width
             anchors.topMargin:  _defaultTextHeight / 2
             anchors.top:        parent.top
             anchors.bottom:     parent.bottom
             clip:               true
             contentHeight:      buttonColumn.height
-            contentWidth:       parent.width
+            contentWidth:       buttonColumn.width
             boundsBehavior:     Flickable.StopAtBounds
             flickableDirection: Flickable.VerticalFlick
 
             Column {
                 id:         buttonColumn
-                width:      mainWindow.menuButtonWidth
+                width:      _maxButtonWidth
                 spacing:    _defaultTextHeight / 2
 
+                property real _maxButtonWidth: 0
+
+                Component.onCompleted: reflowWidths()
+
+                Connections {
+                    target: componentRepeater
+
+                    onModelChanged: buttonColumn.reflowWidths()
+                }
+
+                function reflowWidths() {
+                    for (var i=0; i<children.length; i++) {
+                        _maxButtonWidth = Math.max(_maxButtonWidth, children[i].width)
+                    }
+                    for (var i=0; i<children.length; i++) {
+                        children[i].width = _maxButtonWidth
+                    }
+                }
+
                 SubMenuButton {
                     id:             summaryButton
-                    width:          mainWindow.menuButtonWidth
                     imageResource: "/qmlimages/VehicleSummaryIcon.png"
                     setupIndicator: false
                     checked:        true
@@ -242,7 +260,6 @@ Rectangle {
 
                 SubMenuButton {
                     id:             firmwareButton
-                    width:          mainWindow.menuButtonWidth
                     imageResource:  "/qmlimages/FirmwareUpgradeIcon.png"
                     setupIndicator: false
                     exclusiveGroup: setupButtonGroup
@@ -254,7 +271,6 @@ Rectangle {
 
                 SubMenuButton {
                     id:             px4FlowButton
-                    width:          mainWindow.menuButtonWidth
                     exclusiveGroup: setupButtonGroup
                     visible:        QGroundControl.multiVehicleManager.activeVehicle ? QGroundControl.multiVehicleManager.activeVehicle.genericFirmware : false
                     setupIndicator: false
@@ -264,7 +280,6 @@ Rectangle {
 
                 SubMenuButton {
                     id:             joystickButton
-                    width:          mainWindow.menuButtonWidth
                     setupIndicator: true
                     setupComplete:  joystickManager.activeJoystick ? joystickManager.activeJoystick.calibrated : false
                     exclusiveGroup: setupButtonGroup
@@ -275,10 +290,10 @@ Rectangle {
                 }
 
                 Repeater {
-                    model: _fullParameterVehicleAvailable ? multiVehicleManager.activeVehicle.autopilot.vehicleComponents : 0
+                    id:     componentRepeater
+                    model:  _fullParameterVehicleAvailable ? multiVehicleManager.activeVehicle.autopilot.vehicleComponents : 0
 
                     SubMenuButton {
-                        width:          mainWindow.menuButtonWidth
                         imageResource:  modelData.iconResource
                         setupIndicator: modelData.requiresSetup
                         setupComplete:  modelData.setupComplete
@@ -290,7 +305,6 @@ Rectangle {
                 }
 
                 SubMenuButton {
-                    width:          mainWindow.menuButtonWidth
                     setupIndicator: false
                     exclusiveGroup: setupButtonGroup
                     visible:        multiVehicleManager.parameterReadyVehicleAvailable