diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp
index af8cd56ea..d0b393aa2 100644
--- a/radio/src/gui/480x272/model_setup.cpp
+++ b/radio/src/gui/480x272/model_setup.cpp
@@ -238,7 +238,7 @@ bool menuModelSetup(event_t event)
   MENU(STR_MENUSETUP, MODEL_ICONS, menuTabModel, MENU_MODEL_SETUP, ITEM_MODEL_SETUP_MAX,
        { 0, 0, TIMERS_ROWS, 0, 1, 0, 0,
          LABEL(Throttle), 0, 0, 0,
-         LABEL(PreflightCheck), 0, 0, SW_WARN_ITEMS(),POT_WARN_ROWS, (g_model.potsWarnMode ? POT_WARN_ITEMS() : HIDDEN_ROW),(g_model.potsWarnMode ? SLIDER_WARN_ITEMS() : HIDDEN_ROW), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_ROTARY_ENCODERS-1), 0,
+         LABEL(PreflightCheck), 0, 0, SW_WARN_ITEMS(), POT_WARN_ROWS, (g_model.potsWarnMode ? POT_WARN_ITEMS() : HIDDEN_ROW), (g_model.potsWarnMode ? SLIDER_WARN_ITEMS() : HIDDEN_ROW), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_ROTARY_ENCODERS-1), 0,
          LABEL(InternalModule),
          INTERNAL_MODULE_MODE_ROWS,
          INTERNAL_MODULE_CHANNELS_ROWS,
@@ -488,7 +488,6 @@ bool menuModelSetup(event_t event)
       }
 
       case ITEM_MODEL_SLIDPOT_WARNING_STATE:
-      {
         lcdDrawText(MENUS_MARGIN_LEFT, y,STR_POTWARNINGSTATE);
         lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, PSTR("\004""OFF\0""Man\0""Auto"), g_model.potsWarnMode, attr);
         if (attr) {
@@ -496,13 +495,12 @@ bool menuModelSetup(event_t event)
           storageDirty(EE_MODEL);
         }
         break;
-      }
 
       case ITEM_MODEL_POTS_WARNING:
       {
         lcdDrawText(MENUS_MARGIN_LEFT, y, STR_POTWARNING);
         if (attr) {
-          if (!READ_ONLY() && menuHorizontalPosition+1 && event==EVT_KEY_LONG(KEY_ENTER)) {
+          if (!READ_ONLY() && menuHorizontalPosition >= 0 && event==EVT_KEY_LONG(KEY_ENTER)) {
             killEvents(event);
             if (g_model.potsWarnMode == POTS_WARN_MANUAL) {
               SAVE_POT_POSITION(menuHorizontalPosition);
@@ -511,7 +509,7 @@ bool menuModelSetup(event_t event)
             }
           }
 
-          if (!READ_ONLY() && menuHorizontalPosition+1 && s_editMode && event==EVT_KEY_BREAK(KEY_ENTER)) {
+          if (!READ_ONLY() &&  menuHorizontalPosition >= 0 && s_editMode && event==EVT_KEY_BREAK(KEY_ENTER)) {
             s_editMode = 0;
             g_model.potsWarnEnabled ^= (1 << (menuHorizontalPosition));
             storageDirty(EE_MODEL);
@@ -538,7 +536,6 @@ bool menuModelSetup(event_t event)
       }
 
       case ITEM_MODEL_SLIDERS_WARNING:
-      {
         lcdDrawText(MENUS_MARGIN_LEFT, y, STR_SLIDERWARNING);
         if (attr) {
           if (!READ_ONLY() && menuHorizontalPosition+1 && event==EVT_KEY_LONG(KEY_ENTER)) {
@@ -574,7 +571,6 @@ bool menuModelSetup(event_t event)
           }
         }
         break;
-      }
 
       case ITEM_MODEL_BEEP_CENTER:
         lcdDrawText(MENUS_MARGIN_LEFT, y, STR_BEEPCTR);