diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 2885be15..437c0084 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1686,6 +1686,12 @@
     "pidTuningAngle": {
         "message": "Angle"
     },
+    "pidTuningLevelAngleLimit": {
+        "message": "Angle Limit"
+    },
+    "pidTuningLevelSensitivity": {
+        "message": "Sensitivity"
+    },
     "pidTuningLevelHelp": {
         "message": "The values below change the behaviour of the ANGLE and HORIZON flight modes. Different PID controllers handle the values differently. Please check the documentation."
     },
diff --git a/tabs/pid_tuning.html b/tabs/pid_tuning.html
index 3be0d8b2..28a53024 100755
--- a/tabs/pid_tuning.html
+++ b/tabs/pid_tuning.html
@@ -210,13 +210,6 @@
                         </table>
                     </div>
                     <div id="pid_accel" class="gui_box grey topspacer pid_tuning">
-                        <table class="pid_titlebar">
-                            <tr>
-                                <th class="third" i18n="pidTuningName"></th>
-                                <th class="third" i18n="pidTuningStrength" style="width: 33%;"></th>
-                                <th class="third" i18n="pidTuningTransition" style="width: 33%;"></th>
-                            </tr>
-                        </table>
                         <table id="pid_level" class="pid_tuning">
                             <tr>
                                 <th colspan="3">
@@ -226,6 +219,15 @@
                                     </div>
                                 </th>
                             </tr>
+                        </table>
+                        <table class="pid_titlebar">
+                            <tr>
+                                <th class="third" i18n="pidTuningName"></th>
+                                <th class="third" i18n="pidTuningStrength" style="width: 33%;"></th>
+                                <th class="third" i18n="pidTuningTransition" style="width: 33%;"></th>
+                            </tr>
+                        </table>
+                        <table>
                             <tr class="ANGLE">
                                 <!-- 7 -->
                                 <td class="third" i18n="pidTuningAngle"></td>
@@ -239,6 +241,20 @@
                                 <td class="third"><input type="number" name="d" step="1" min="0" max="255" /></td>
                             </tr>
                         </table>
+                        <table class="pid_titlebar pid_sensitivity">
+                            <tr>
+                                <th class="third"></th>
+                                <th class="third" i18n="pidTuningLevelAngleLimit" style="width: 33%;"></th>
+                                <th class="third" i18n="pidTuningLevelSensitivity" style="width: 33%;"></th>
+                            </tr>
+                        </table>
+                        <table id="pid_sensitivity" class="pid_tuning pid_sensitivity">
+                            <tr>
+                                <td class="third"></td>
+                                <td class="third"><input type="number" name="angleLimit" step="1" min="10" max="200" /></td>
+                                <td class="third"><input type="number" name="sensitivity" step="1" min="10" max="120" /></td>
+                            </tr>
+                        </table>
                     </div>
                     <div class="gui_box grey topspacer pidTuningFeatures">
                         <table class="pid_titlebar new_rates">
diff --git a/tabs/pid_tuning.js b/tabs/pid_tuning.js
index 56d09db6..c9bad697 100755
--- a/tabs/pid_tuning.js
+++ b/tabs/pid_tuning.js
@@ -263,6 +263,13 @@ TABS.pid_tuning.initialize = function (callback) {
         } else {
             $('.pid_filter .gyroNotch2').hide();
         }
+
+        if (semver.gte(CONFIG.apiVersion, "1.24.0")) {
+            $('.pid_tuning input[name="angleLimit"]').val(ADVANCED_TUNING.levelAngleLimit);
+            $('.pid_tuning input[name="sensitivity"]').val(ADVANCED_TUNING.levelSensitivity);
+        } else {
+            $('.pid_sensitivity').hide();
+        }
     }
 
     function form_to_pid_and_rc() {
@@ -369,6 +376,10 @@ TABS.pid_tuning.initialize = function (callback) {
             }
         }
 
+        if (semver.gte(CONFIG.apiVersion, "1.24.0")) {
+            ADVANCED_TUNING.levelAngleLimit = parseInt($('.pid_tuning input[name="angleLimit"]').val());
+            ADVANCED_TUNING.levelSensitivity = parseInt($('.pid_tuning input[name="sensitivity"]').val());
+        }
     }
 
     function showAllPids() {
@@ -383,6 +394,7 @@ TABS.pid_tuning.initialize = function (callback) {
         if (have_sensor(CONFIG.activeSensors, 'acc')) {
             $('#pid_accel').show();
             $('#pid_level').show();
+            $('#pid_sensitivity').show();
         }
 
         var showTitle = false;