diff --git a/src/frontend/plotting/grid.c b/src/frontend/plotting/grid.c
index 23563da97..77476048b 100644
--- a/src/frontend/plotting/grid.c
+++ b/src/frontend/plotting/grid.c
@@ -453,7 +453,7 @@ lingrid(GRAPH *graph, double lo, double hi, double delta, int type, Axis axis)
         max = graph->absolute.width - graph->viewportxoff;
         /* don't subtract font height from right border of grid */
         if (graph->grid.ylabel)
-            max += graph->fontheight;
+            max += (int)(1.6 * graph->fontheight);
     } else {
         graph->viewportxoff = (digits + 5 + mag - mag3) * graph->fontwidth;
         /* add height of the vertical text to offset*/
@@ -733,7 +733,13 @@ loggrid(GRAPH *graph, double lo, double hi, int type, Axis axis)
     if (axis == x_axis) {
         margin = graph->viewportxoff;
         max = graph->absolute.width - graph->viewportxoff;
+        /* don't subtract font height from right border of grid */
+        if (graph->grid.ylabel)
+            max += (int)(1.6 * graph->fontheight);
     } else {
+        /* add height of the vertical text to offset*/
+        if (graph->grid.ylabel)
+            graph->viewportxoff += (int)(1.6 * graph->fontheight);
         margin = graph->viewportyoff;
         max = graph->absolute.height - graph->viewportyoff;
     }