diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp
index 898c9067..079b1666 100644
--- a/source/Core/Src/Settings.cpp
+++ b/source/Core/Src/Settings.cpp
@@ -70,7 +70,7 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp
     {1, POWER_PULSE_WAIT_MAX, 1, POWER_PULSE_WAIT_DEFAULT},         // KeepAwakePulseWait
     {1, POWER_PULSE_DURATION_MAX, 1, POWER_PULSE_DURATION_DEFAULT}, // KeepAwakePulseDuration
     {360, 900, 1, VOLTAGE_DIV},                                     // VoltageDiv
-    {100, 580, 10, BOOST_TEMP},                                     // BoostTemp
+    {0, MAX_TEMP_F, 10, BOOST_TEMP},                                // BoostTemp
     {100, 2500, 1, CALIBRATION_OFFSET},                             // CalibrationOffset
     {0, MAX_POWER_LIMIT, POWER_LIMIT_STEPS, POWER_LIMIT},           // PowerLimit
     {0, 2, 1, REVERSE_BUTTON_TEMP_CHANGE},                          // ReverseButtonTempChangeEnabled
diff --git a/source/Core/Src/gui.cpp b/source/Core/Src/gui.cpp
index e0fa1a86..73ba8ed2 100644
--- a/source/Core/Src/gui.cpp
+++ b/source/Core/Src/gui.cpp
@@ -513,11 +513,11 @@ static bool settings_setBoostTemp(void) {
       value += 20; // Go up 20F at a time
     }
 
-    if (value > MAX_TEMP_F) {
+    if (value >= MAX_TEMP_F) {
       value = 0; // jump to off
     }
     setSettingValue(SettingsOptions::BoostTemp, value);
-    return value == MAX_TEMP_F - 10;
+    return value >= (MAX_TEMP_F - 10);
   }
   if (value == 0) {
     value = MIN_BOOST_TEMP_C; // loop back at 250
@@ -528,7 +528,7 @@ static bool settings_setBoostTemp(void) {
     value = 0; // Go to off state
   }
   setSettingValue(SettingsOptions::BoostTemp, value);
-  return value == MAX_TEMP_C;
+  return value >= MAX_TEMP_C;
 }
 
 static void settings_displayBoostTemp(void) {