diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp
index dc08a8ef3..56319cbd0 100644
--- a/Firmware/mmu2.cpp
+++ b/Firmware/mmu2.cpp
@@ -356,10 +356,6 @@ bool MMU2::load_filament_to_nozzle(uint8_t index) {
         SetActiveExtruder(0);
 
         Sound_MakeSound(e_SOUND_TYPE_StandardConfirm);
-
-        // TODO: The LCD should prompt the user with a full-screen message
-        //       to ask whether the extruder is extruding the correct color.
-        //       This does not apply when the tool change is done via gcode.
         return true;
     }
 }
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 7d2e6f035..87f61dc4d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2301,8 +2301,6 @@ void lcd_load_filament_color_check()
 {
 	bool clean = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_CLEAN), false, true);
 	while (clean == MIDDLE_BUTTON_CHOICE) {
-		lcd_update_enable(true);
-		lcd_update(2);
 		load_filament_final_feed();
 		st_synchronize();
 		clean = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_CLEAN), false, true);
@@ -5125,6 +5123,13 @@ static void mmu_load_filament_menu() {
 
 static inline void lcd_mmu_load_to_nozzle_wrapper(uint8_t index){
     MMU2::mmu2.load_filament_to_nozzle(index);
+
+	// Ask user if the extruded color is correct:
+	lcd_return_to_status();
+	lcd_update_enable(true);
+	lcd_load_filament_color_check();
+	lcd_setstatuspgm(MSG_WELCOME);
+	custom_message_type = CustomMsg::Status;
 }
 
 static void mmu_load_to_nozzle_menu() {