diff --git a/locale/en/messages.json b/locale/en/messages.json
index 0dbe2f22d..3c41a48c8 100644
--- a/locale/en/messages.json
+++ b/locale/en/messages.json
@@ -1093,6 +1093,12 @@
     "configurationLaunchIdleDelayHelp": {
         "message": "Set a time delay between raising the throttle for the launch, and the motor starting at idle throttle. Default: 0 [0-60000]"
     },
+    "configurationWiggleWakeIdle": {
+        "message": "Wiggle to Wake Idle"
+    },
+    "configurationWiggleWakeIdleHelp": {
+        "message": "If enabled, this feature allows a yaw wiggle of the aircraft to wake up the motors from idle.<br />0: Disabled (default)<br />1: 1 wiggle - This setting has a higher detection point, for airplanes without a tail that can be moved easily<br />2: 2 wiggles - This setting has a lower detection point, but requires the repeated action. This is intended for larger models and airplanes with tails"
+    },
     "configurationLaunchMotorDelay": {
         "message": "Motor Delay"
     },
diff --git a/tabs/advanced_tuning.html b/tabs/advanced_tuning.html
index dcb2b5c7d..8bea315cb 100644
--- a/tabs/advanced_tuning.html
+++ b/tabs/advanced_tuning.html
@@ -20,6 +20,11 @@
                             <label for="launchIdleDelay"><span data-i18n="configurationLaunchIdleDelay"></span></label>
                             <div for="launchIdleDelay" class="helpicon cf_tip" data-i18n_title="configurationLaunchIdleDelayHelp"></div>
                         </div>
+                        <div class="select">
+                            <select id="wiggleWakeIdle" data-setting="nav_fw_launch_wiggle_to_wake_idle"></select>
+                            <label for="wiggleWakeIdle"><span data-i18n="configurationWiggleWakeIdle"></span></label>
+                            <div for="wiggleWakeIdle" class="helpicon cf_tip" data-i18n_title="configurationWiggleWakeIdleHelp"></div>
+                        </div>
                         <div class="number">
                             <input type="number" id="launchMaxAngle" data-unit="deg" data-setting="nav_fw_launch_max_angle" data-setting-multiplier="1" step="1" min="5" max="180" />
                             <label for="launchMaxAngle"><span data-i18n="configurationLaunchMaxAngle"></span></label>
diff --git a/tabs/advanced_tuning.js b/tabs/advanced_tuning.js
index 0dc69cc13..d86b07222 100644
--- a/tabs/advanced_tuning.js
+++ b/tabs/advanced_tuning.js
@@ -73,6 +73,10 @@ TABS.advanced_tuning.initialize = function (callback) {
             TABS.advanced_tuning.checkRequirements_IdleThrottle();
         });
 
+        $('#wiggleWakeIdle').on('change', function () {
+            TABS.advanced_tuning.checkRequirements_IdleThrottle();
+        });
+
         $('#rthHomeAltitude').on('keyup', () => {
             TABS.advanced_tuning.checkRequirements_LinearDescent();
         });
@@ -97,7 +101,7 @@ TABS.advanced_tuning.initialize = function (callback) {
 
 TABS.advanced_tuning.checkRequirements_IdleThrottle = function() {
     let idleThrottle = $('#launchIdleThr');
-    if ($('#launchIdleDelay').val() > 0 && (idleThrottle.val() == "" || idleThrottle.val() < "1150")) {
+    if (($('#launchIdleDelay').val() > 0 || $('#wiggleWakeIdle').find(":selected").val() > 0) && (idleThrottle.val() == "" || idleThrottle.val() < "1150")) {
         idleThrottle.addClass('inputRequiredWarning');
     } else {
         idleThrottle.removeClass('inputRequiredWarning');