diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 0fbfee27..f608fa60 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -2494,6 +2494,9 @@
     "rthClimbFirst": {
         "message": "Climb before RTH"
     },
+    "rthClimbFirstHelp": {
+        "message": "If set to ON or ON_FW_SPIRAL, aircraft will climb to nav_rth_altitude first before turning to head home. If set to OFF, aircraft will turn and head home immediately climbing on the way. For a fixed wing, ON will use a linear climb, ON_FW_SPIRAL will use a loiter turning climb with climb rate set by nav_auto_climb_rate and turn rate set by nav_fw_loiter_radius (ON_FW_SPIRAL is a fixed wing setting and behaves the same as ON for a multirotor)."
+    },
     "rthClimbIgnoreEmergency": {
         "message": "Climb regardless of position sensors health"
     },
diff --git a/tabs/advanced_tuning.html b/tabs/advanced_tuning.html
index 77c44936..dc79a9cf 100644
--- a/tabs/advanced_tuning.html
+++ b/tabs/advanced_tuning.html
@@ -335,9 +335,10 @@
                             <div class="helpicon cf_tip" data-i18n_title="rthHomeAltitudeHelp"></div>
                         </div>
     
-                        <div class="checkbox">
-                            <input type="checkbox" class="toggle update_preview" id="rth-climb-first" data-setting="nav_rth_climb_first" data-live="true" />
+                        <div class="select">
+                            <select id="rth-climb-first" data-setting="nav_rth_climb_first"></select>
                             <label for="rth-climb-first"><span data-i18n="rthClimbFirst"></span></label>
+                            <div class="helpicon cf_tip" data-i18n_title="rthClimbFirstHelp"></div>
                         </div>
     
                         <div class="checkbox">