1 files changed, 3 insertions, 1 deletions
diff --git a/src/actions.c b/src/actions.c
index 6f82590..875c235 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1471,7 +1471,8 @@ cmd_help (int interactive, void *data)
 	}
 
       y += FONT_HEIGHT (defaults.font);
-      if (y > s->root_attr.height)
+      /* Make sure the next line fits entirely within the window. */
+      if (y + FONT_HEIGHT (defaults.font) >= s->root_attr.height)
 	{
 	  if (drawing_keys)
 	    {
@@ -1483,6 +1484,7 @@ cmd_help (int interactive, void *data)
 	    {
 	      x += max_width + 20;
 	      drawing_keys = 1;
+	      i++;
 	      old_i = i;
 	    }