diff --git a/nanovna.h b/nanovna.h
index 31b6fb0..baaa90b 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -304,7 +304,7 @@ extern  uint16_t _grid_y;
 #define AREA_WIDTH_NORMAL  (CELLOFFSETX + WIDTH  + 1)
 #define AREA_HEIGHT_NORMAL (              HEIGHT + 1)
 
-#define GRID_X_TEXT       (AREA_WIDTH_NORMAL - 25)
+#define GRID_X_TEXT       (AREA_WIDTH_NORMAL - 6*5)
 
 // Smith/polar chart
 #define P_CENTER_X (CELLOFFSETX + WIDTH/2)
diff --git a/plot.c b/plot.c
index ec40127..a1bafa2 100644
--- a/plot.c
+++ b/plot.c
@@ -1955,7 +1955,7 @@ static void cell_grid_line_info(int x0, int y0)
   for (int i = 0; i < NGRIDY; i++){
     if (ypos >= CELLHEIGHT) break;
     if (ypos >= -FONT_GET_HEIGHT){
-      plot_printf(buf, sizeof buf, "% .2F", ref);
+      plot_printf(buf, sizeof buf, "% 6.2F", ref);
       cell_drawstring(buf, xpos, ypos);
     }
     ypos+=GRIDY;