diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index b1bb1afe4..9413e7017 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -3469,7 +3469,7 @@ static void mmu_M600_load_filament(bool automatic, float nozzle_temp) {
         slot = SpoolJoin::spooljoin.nextSlot();
     } else {
         // Only ask for the slot if automatic/SpoolJoin is off
-        slot = choose_menu_P(_T(MSG_SELECT_EXTRUDER), _T(MSG_EXTRUDER));
+        slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT));
     }
 
     setTargetHotend(nozzle_temp);
diff --git a/Firmware/Tcodes.cpp b/Firmware/Tcodes.cpp
index 30ea49c7b..c9a7f7238 100644
--- a/Firmware/Tcodes.cpp
+++ b/Firmware/Tcodes.cpp
@@ -29,11 +29,7 @@ struct SChooseFromMenu {
 };
 
 SChooseFromMenu TCodeChooseFromMenu() {
-    if (MMU2::mmu2.Enabled()) {
-        return SChooseFromMenu( choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)), true );
-    } else {
-        return SChooseFromMenu( choose_menu_P(_T(MSG_SELECT_EXTRUDER), _T(MSG_EXTRUDER)), false );
-    }
+    return SChooseFromMenu( choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)), MMU2::mmu2.Enabled() );
 }
 
 void TCodes(char *const strchr_pointer, uint8_t codeValue) {
@@ -48,7 +44,7 @@ void TCodes(char *const strchr_pointer, uint8_t codeValue) {
     } else if (strchr_pointer[index] == 'x'){
         // load to extruder gears; if mmu is not present do nothing
         if (MMU2::mmu2.Enabled()) {
-            MMU2::mmu2.tool_change(strchr_pointer[index], choose_menu_P(_T(MSG_SELECT_EXTRUDER), _T(MSG_EXTRUDER)));
+            MMU2::mmu2.tool_change(strchr_pointer[index], choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)));
         }
     } else if (strchr_pointer[index] == 'c'){
         // load from extruder gears to nozzle (nozzle should be preheated)