diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 644ae31f1..3d6a1d5b6 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -204,6 +204,7 @@ CardReader card;
 #endif
 float homing_feedrate[] = HOMING_FEEDRATE;
 bool axis_relative_modes[] = AXIS_RELATIVE_MODES;
+bool ignore_stepper_inactivity_queue_check = false;
 int feedmultiply=100; //100->1 200->2
 int saved_feedmultiply;
 int extrudemultiply=100; //100->1 200->2
@@ -3616,7 +3617,9 @@ case 404:  //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
         while(!lcd_clicked()){
           cnt++;
           manage_heater();
+		  ignore_stepper_inactivity_queue_check = true;
           manage_inactivity();
+		  ignore_stepper_inactivity_queue_check = false;
           lcd_update();
           if(cnt==0)
           {
@@ -4335,7 +4338,7 @@ void manage_inactivity()
   if(stepper_inactive_time)  {
     if( (millis() - previous_millis_cmd) >  stepper_inactive_time )
     {
-      if(blocks_queued() == false) {
+      if(blocks_queued() == false && ignore_stepper_inactivity_queue_check != true) {
         disable_x();
         disable_y();
         disable_z();