diff --git a/plot.c b/plot.c
index 9236d1a..3d0dc47 100644
--- a/plot.c
+++ b/plot.c
@@ -1612,10 +1612,11 @@ draw_all(bool flush)
   //  STOP_PROFILE
 #endif
   }
-  if (redraw_request & (REDRAW_CAL_STATUS | REDRAW_FREQUENCY) )
+  if (redraw_request & (REDRAW_CAL_STATUS | REDRAW_FREQUENCY) ) {
     draw_cal_status();                      // calculates the actual sweep time, must be before draw_frequencies
-  if (redraw_request & REDRAW_FREQUENCY)
+//  if (redraw_request & REDRAW_FREQUENCY)
     draw_frequencies();
+  }
   if (redraw_request & REDRAW_BATTERY)
     draw_battery_status();
   redraw_request = 0;
diff --git a/sa_core.c b/sa_core.c
index 85f7085..2f06bf9 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -1608,12 +1608,19 @@ again:                          // Waiting for a trigger jumps back to here
     if (MODE_OUTPUT(setting.mode) && setting.additional_step_delay_us < 500)     // Minimum wait time to prevent LO from lockup during output frequency sweep
       setting.additional_step_delay_us = 500;
     if (break_on_operation  && MODE_INPUT(setting.mode)) {                       // during normal operation
+      redraw_request |= REDRAW_CAL_STATUS;
+      if (FREQ_IS_CW()) {                                       // if zero span mode
+        update_grid();                                          // and update grid
+        redraw_request |= REDRAW_FREQUENCY;                     // and time at bottom
+      }
+#if 0
       draw_cal_status();                                        // show sweep time estimation
       if (FREQ_IS_CW()) {                                       // if zero span mode
         update_grid();                                          // and update grid
         //redraw_request |= REDRAW_FREQUENCY; // and time at bottom
         draw_frequencies();
       }
+#endif
     }
   }
   uint32_t prev_sweep_time = setting.actual_sweep_time_us;