diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index e90eaa8a6..0a5d5196d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2384,7 +2384,6 @@ static void mFilamentItem_PVB()
 
 void mFilamentBack()
 {
-    menu_back();
     if (eFilamentAction == FilamentAction::AutoLoad ||
             eFilamentAction == FilamentAction::Preheat ||
             eFilamentAction == FilamentAction::Lay1Cal)
@@ -2398,13 +2397,16 @@ void lcd_generic_preheat_menu()
     MENU_BEGIN();
     if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE))
     {
+        ON_MENU_LEAVE(
+            mFilamentBack();
+        );
         if (eFilamentAction == FilamentAction::Lay1Cal)
         {
-            MENU_ITEM_FUNCTION_P(_T(MSG_BACK), mFilamentBack);
+            MENU_ITEM_BACK_P(_T(MSG_BACK));
         }
         else
         {
-            MENU_ITEM_FUNCTION_P(_T(MSG_MAIN), mFilamentBack);
+            MENU_ITEM_BACK_P(_T(MSG_MAIN));
         }
     }
     if (farm_mode)