diff --git a/panels/job_status.py b/panels/job_status.py
index fbe3bd42..09e51ac5 100644
--- a/panels/job_status.py
+++ b/panels/job_status.py
@@ -595,8 +595,6 @@ class Panel(ScreenPanel):
     def update_time_left(self):
         total_duration = float(self._printer.get_stat('print_stats', 'total_duration'))
         print_duration = float(self._printer.get_stat('print_stats', 'print_duration'))
-        if not self.file_metadata.get('filament_total'):  # No-extrusion
-            print_duration = total_duration
         fila_used = float(self._printer.get_stat('print_stats', 'filament_used'))
         if "gcode_start_byte" in self.file_metadata:
             progress = (max(self._printer.get_stat('virtual_sdcard', 'file_position') -
@@ -614,6 +612,10 @@ class Panel(ScreenPanel):
             spdcomp = sqrt(self.speed_factor)
             slicer_time = ((self.file_metadata['estimated_time']) / spdcomp)
             self.labels["slicer_time"].set_label(self.format_time(slicer_time))
+            if print_duration < 1:
+                print_duration = slicer_time * progress
+        elif print_duration < 1:  # No-extrusion
+            print_duration = total_duration
 
         if 'filament_total' in self.file_metadata and self.file_metadata['filament_total'] >= fila_used > 0:
             filament_time = (print_duration / (fila_used / self.file_metadata['filament_total']))