diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
index cab09715b7..e4b6fb72a0 100644
--- a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
+++ b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
@@ -134,23 +134,17 @@ bool drawing_mesh = false;
 
 void BedLevelTools::manualMove(const uint8_t mesh_x, const uint8_t mesh_y, bool zmove/*=false*/) {
   gcode.process_subcommands_now(F("G28O"));
-  if (zmove) {
-    planner.synchronize();
-    current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
-    planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
-    planner.synchronize();
-  }
-  else {
+  if (!zmove) {
     dwinShowPopup(ICON_BLTouch, F("Moving to Point"), F("Please wait until done."));
     hmiSaveProcessID(ID_NothingToDo);
     gcode.process_subcommands_now(TS(F("G0 F300 Z"), p_float_t(Z_CLEARANCE_BETWEEN_PROBES, 3)));
     gcode.process_subcommands_now(TS(F("G42 F4000 I"), mesh_x, F(" J"), mesh_y));
-    planner.synchronize();
-    current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
-    planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
-    planner.synchronize();
-    hmiReturnScreen();
   }
+  planner.synchronize();
+  current_position.z = goto_mesh_value ? bedlevel.z_values[mesh_x][mesh_y] : Z_CLEARANCE_BETWEEN_PROBES;
+  planner.buffer_line(current_position, homing_feedrate(Z_AXIS), active_extruder);
+  planner.synchronize();
+  if (!zmove) hmiReturnScreen();
 }
 
 // Move / Probe methods.
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
index b1444fae11..b7a27a253b 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_number_key.cpp
@@ -71,6 +71,7 @@ static void disp_key_value() {
   TERN_(HAS_TRINAMIC_CONFIG, float milliamps);
 
   switch (value) {
+    default: break;
     case PrintAcceleration:
       dtostrf(planner.settings.acceleration, 1, 1, public_buf_m);
       break;
@@ -223,6 +224,7 @@ static void disp_key_value() {
 
 static void set_value_confirm() {
   switch (value) {
+    default: break;
     case PrintAcceleration:   planner.settings.acceleration = atof(key_value); break;
     case RetractAcceleration: planner.settings.retract_acceleration = atof(key_value); break;
     case TravelAcceleration:  planner.settings.travel_acceleration = atof(key_value); break;
diff --git a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
index bd06e6c1f4..2a906ff80f 100644
--- a/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
@@ -92,35 +92,24 @@ lv_point_t line_points[4][2] = {
   {{PARA_UI_POS_X, PARA_UI_POS_Y*3 + PARA_UI_SIZE_Y}, {TFT_WIDTH, PARA_UI_POS_Y*3 + PARA_UI_SIZE_Y}},
   {{PARA_UI_POS_X, PARA_UI_POS_Y*4 + PARA_UI_SIZE_Y}, {TFT_WIDTH, PARA_UI_POS_Y*4 + PARA_UI_SIZE_Y}}
 };
+enum CfgLang : uint8_t {
+  LANG_en      = LANG_ENGLISH,
+  LANG_zh_CN   = LANG_SIMPLE_CHINESE,
+  LANG_zh_TW   = LANG_COMPLEX_CHINESE,
+  LANG_jp_kana = LANG_JAPAN,
+  LANG_de      = LANG_GERMAN,
+  LANG_fr      = LANG_FRENCH,
+  LANG_ru      = LANG_RUSSIAN,
+  LANG_ko_KR   = LANG_KOREAN,
+  LANG_tr      = LANG_TURKISH,
+  LANG_es      = LANG_SPANISH,
+  LANG_el      = LANG_GREEK,
+  LANG_it      = LANG_ITALY,
+  LANG_pt      = LANG_PORTUGUESE
+};
 void gCfgItems_init() {
   gCfgItems.multiple_language = MULTI_LANGUAGE_ENABLE;
-  #if 1 // LCD_LANGUAGE == en
-    gCfgItems.language = LANG_ENGLISH;
-  #elif LCD_LANGUAGE == zh_CN
-    gCfgItems.language = LANG_SIMPLE_CHINESE;
-  #elif LCD_LANGUAGE == zh_TW
-    gCfgItems.language = LANG_COMPLEX_CHINESE;
-  #elif LCD_LANGUAGE == jp_kana
-    gCfgItems.language = LANG_JAPAN;
-  #elif LCD_LANGUAGE == de
-    gCfgItems.language = LANG_GERMAN;
-  #elif LCD_LANGUAGE == fr
-    gCfgItems.language = LANG_FRENCH;
-  #elif LCD_LANGUAGE == ru
-    gCfgItems.language = LANG_RUSSIAN;
-  #elif LCD_LANGUAGE == ko_KR
-    gCfgItems.language = LANG_KOREAN;
-  #elif LCD_LANGUAGE == tr
-    gCfgItems.language = LANG_TURKISH;
-  #elif LCD_LANGUAGE == es
-    gCfgItems.language = LANG_SPANISH;
-  #elif LCD_LANGUAGE == el
-    gCfgItems.language = LANG_GREEK;
-  #elif LCD_LANGUAGE == it
-    gCfgItems.language = LANG_ITALY;
-  #elif LCD_LANGUAGE == pt
-    gCfgItems.language = LANG_PORTUGUESE;
-  #endif
+  gCfgItems.language = CAT(LANG_, LCD_LANGUAGE);
   gCfgItems.leveling_mode     = 0;
   gCfgItems.from_flash_pic    = false;
   gCfgItems.curFilesize       = 0;