diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 7e9da1c1..ffa12d38 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -7457,7 +7457,6 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s
     {
       if(blocks_queued() == false && ignore_stepper_queue == false) {
         disable_x();
-//        SERIAL_ECHOLNPGM("manage_inactivity - disable Y");
         disable_y();
         disable_z();
         disable_e0();
@@ -7791,7 +7790,7 @@ static void wait_for_heater(long codenum, uint8_t extruder) {
 				codenum = millis();
 		}
 			manage_heater();
-			manage_inactivity();
+			manage_inactivity(true); //do not disable steppers
 			lcd_update(0);
 #ifdef TEMP_RESIDENCY_TIME
 			/* start/restart the TEMP_RESIDENCY_TIME timer whenever we reach target temp for the first time
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 311d72ca..c2d8f885 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5677,6 +5677,7 @@ void lcd_resume_print()
     lcd_reset_alert_level(); //for fan speed error
     restore_print_from_ram_and_continue(0.0);
     pause_time += (millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation
+	refresh_cmd_timeout();
     isPrintPaused = false;
 }