Index: main/grid/display.lisp
===================================================================
--- main/grid/display.lisp	(revision main,67)
+++ main/grid/display.lisp	(revision main,71)
@@ -134,4 +134,8 @@
 (defun ensure-row-visible (grid row)
   "Returns T when scrolling was necessary."
-  (with-slots (data) grid
-    (setf (row-scroll grid) (- row (header-rows data)))))
+  (with-slots (data window) grid
+    (let ((data-row (- row (header-rows data))))
+      (when (>= data-row 0)
+        (boundf (row-scroll grid)
+                (- row (size window) -1)
+                data-row)))))