diff --git a/src/ex_getln.c b/src/ex_getln.c
index fd47ef3..2f5793a 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -6448,7 +6448,7 @@
 	else
 	    clear_hist_entry(&new_hist[i]);
     }
-    hisidx[type] = len - 1;
+    hisidx[type] = (i < len ? i : len) - 1;
 
     /* Free what is not kept. */
     for (i = 0; i < viminfo_hisidx[type]; i++)