diff --git a/src/move.c b/src/move.c
index aa90b52..d90e4d2 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1125,10 +1125,10 @@
 	    n = curwin->w_wrow + so;
 	else
 	    n = p_lines;
-	if ((colnr_T)n >= curwin->w_height + curwin->w_skipcol / width)
+	if ((colnr_T)n >= curwin->w_height + curwin->w_skipcol / width - so)
 	    extra += 2;
 
-	if (extra == 3 || p_lines < so * 2)
+	if (extra == 3 || p_lines <= so * 2)
 	{
 	    // not enough room for 'scrolloff', put cursor in the middle
 	    n = curwin->w_virtcol / width;
diff --git a/src/testdir/test_breakindent.vim b/src/testdir/test_breakindent.vim
index 42b8c8c..98aff02 100644
--- a/src/testdir/test_breakindent.vim
+++ b/src/testdir/test_breakindent.vim
@@ -634,7 +634,7 @@
   call s:compare_lines(expect, lines)
   " Scroll down one screen line
   setl scrolloff=5
-  norm! 5gj
+  norm! 6gj
   redraw!
   let lines = s:screen_lines(1, 20)
   let expect = [
diff --git a/src/version.c b/src/version.c
index 88cbd07..708fb95 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2495,
+/**/
     2494,
 /**/
     2493,