   {
     if (j >= (MAX_OPTIONS + MAX_COMMANDS))
       j = 0;
-    if (j == option) {
+    if (j == option && !in_edit_state) {
       display.setTextColor(BLACK, WHITE);
     }
     else {

//******************************************************************************
//* function: drawOptionsScreen
//******************************************************************************
void drawOptionsScreen(uint8_t option ) {
  uint8_t i, j;

  display.clearDisplay();

  options[FLIP_SCREEN_OPTION]      = FLIP_SCREEN_DEFAULT;
  options[LIPO_2S_METER_OPTION]    = LIPO_2S_METER_DEFAULT;
  options[LIPO_3S_METER_OPTION]    = LIPO_3S_METER_DEFAULT;
  options[SHOW_STARTSCREEN_OPTION] = SHOW_STARTSCREEN_DEFAULT;
  options[SAVE_SCREEN_OPTION]      = SAVE_SCREEN_DEFAULT;
  options[BATTERY_ALARM_OPTION]    = BATTERY_ALARM_DEFAULT;
  options[ALARM_LEVEL_OPTION]      = ALARM_LEVEL_DEFAULT;
}

//******************************************************************************
