diff --git a/src/AutoPilotPlugins/Common/SetupPage.qml b/src/AutoPilotPlugins/Common/SetupPage.qml
index 1612c7749abec92e2235ae8133d4176a3427bda6..647eff5069dd2d321dceac06183cd0e28cb444d0 100644
--- a/src/AutoPilotPlugins/Common/SetupPage.qml
+++ b/src/AutoPilotPlugins/Common/SetupPage.qml
@@ -81,6 +81,7 @@ QGCView {
     Item {
         visible:                    _shouldDisableWhenArmed
         anchors.fill:               parent
+        z:                          9999
         Rectangle {
             anchors.fill:           parent
             color:                  "black"
diff --git a/src/VehicleSetup/SetupView.qml b/src/VehicleSetup/SetupView.qml
index 117ff1e7aeae3d648cb086e1c4a0742bd2a23ed9..1fb0418e5932cd0c319861f9b6ecae543f6d623a 100644
--- a/src/VehicleSetup/SetupView.qml
+++ b/src/VehicleSetup/SetupView.qml
@@ -250,7 +250,6 @@ Rectangle {
                 setupIndicator:     false
                 exclusiveGroup:     setupButtonGroup
                 visible:            !ScreenTools.isMobile && _corePlugin.options.showFirmwareUpgrade
-                enabled:            !_vehicleArmed
                 text:               qsTr("Firmware")
                 Layout.fillWidth:   true
 
@@ -291,7 +290,6 @@ Rectangle {
                     exclusiveGroup:     setupButtonGroup
                     text:               modelData.name
                     visible:            modelData.setupSource.toString() !== ""
-                    enabled:            _vehicleArmed ? modelData.allowSetupWhileArmed : true
                     Layout.fillWidth:   true
 
                     onClicked: showVehicleComponentPanel(modelData)