diff --git a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml
index c7a316e..8515522 100644
--- a/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml
+++ b/src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml
@@ -150,6 +150,7 @@ Column {
         unit: "deg/s"
         axis: [ roll, pitch, yaw ]
         chartDisplaySec: 3
+        showAutoModeChange: true
     }
 }
 
diff --git a/src/QmlControls/PIDTuning.qml b/src/QmlControls/PIDTuning.qml
index 064fa76..6f08a59 100644
--- a/src/QmlControls/PIDTuning.qml
+++ b/src/QmlControls/PIDTuning.qml
@@ -27,6 +27,7 @@ RowLayout {
     property string title
     property var    tuningMode
     property double chartDisplaySec:     8 // number of seconds to display
+    property bool   showAutoModeChange:  false
 
     property real   _margins:           ScreenTools.defaultFontPixelHeight / 2
     property int    _currentAxis:       0
@@ -293,7 +294,7 @@ RowLayout {
                 onClicked: {
                     dataTimer.running = !dataTimer.running
                     _last_t = 0
-                    if (autoModeChange.checked) {
+                    if (showAutoModeChange && autoModeChange.checked) {
                         globals.activeVehicle.flightMode = dataTimer.running ? "Stabilized" : globals.activeVehicle.pauseFlightMode
                     }
                 }
@@ -301,8 +302,13 @@ RowLayout {
         }
 
         QGCCheckBox {
+            visible: showAutoModeChange
             id:     autoModeChange
             text:   qsTr("Automatic Flight Mode Switching")
+            onClicked: {
+                if (checked)
+                    dataTimer.running = false
+            }
         }
 
         Column {