diff --git a/plot.c b/plot.c
index 5d1d162..93f6daa 100644
--- a/plot.c
+++ b/plot.c
@@ -2173,8 +2173,7 @@ static void draw_battery_status(void)
 void
 request_to_redraw_grid(void)
 {
-  force_set_markmap();
-  redraw_request |= REDRAW_CELLS;
+  redraw_request |= REDRAW_AREA;
 }
 
 void
diff --git a/sa_core.c b/sa_core.c
index d27f60b..5ccfc7f 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -637,7 +637,7 @@ void set_reflevel(float level)
   set_trace_refpos(0, /* NGRIDY - */ level /* / get_trace_scale(0) */);
   set_trace_refpos(1, /* NGRIDY - */ level /* / get_trace_scale(0) */ );
   set_trace_refpos(2, /* NGRIDY - */ level /* / get_trace_scale(0) */ );
-  redraw_request |= REDRAW_AREA | REDRAW_CAL_STATUS;
+  redraw_request |= REDRAW_CELLS | REDRAW_CAL_STATUS;
 //  dirty = true;
 }
 
@@ -696,7 +696,7 @@ void set_scale(float t) {
   set_trace_scale(1, t);
   set_trace_scale(2, t);
   round_reflevel_to_scale();
-  redraw_request |= REDRAW_AREA | REDRAW_CAL_STATUS;
+  redraw_request |= REDRAW_CELLS | REDRAW_CAL_STATUS;
 }
 
 
diff --git a/ui.c b/ui.c
index a976a46..f95359e 100644
--- a/ui.c
+++ b/ui.c
@@ -1143,7 +1143,7 @@ menu_move_back(void)
     area_width = 0;
   } else {
 //    redraw_frame();
-    request_to_redraw_grid();
+//    request_to_redraw_grid();
     area_width = AREA_WIDTH_NORMAL - MENU_BUTTON_WIDTH;
   }
 
@@ -1166,7 +1166,7 @@ menu_push_submenu(const menuitem_t *submenu)
     area_width = 0;
   } else {
 //    redraw_frame();
-    request_to_redraw_grid();
+//    request_to_redraw_grid();
     area_width = AREA_WIDTH_NORMAL - MENU_BUTTON_WIDTH;
   }
   draw_menu();
@@ -1736,6 +1736,7 @@ leave_ui_mode()
     erase_numeric_input();
     draw_frequencies();
   }
+  redraw_request|=REDRAW_AREA;
 }
 
 #ifdef __VNA__
@@ -2357,7 +2358,7 @@ ui_process_keypad(void)
     ensure_selection();
   } else {
     ui_mode_normal();
-    request_to_redraw_grid();
+//  request_to_redraw_grid();
   }
   //redraw_all();
   touch_start_watchdog();