diff --git a/src/drawscreen.c b/src/drawscreen.c
index 7afcf09..0cddff3 100644
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -1662,7 +1662,7 @@
 	if (mod_top != 0
 		&& wp->w_topline == mod_top
 		&& (!wp->w_lines[0].wl_valid
-		    || wp->w_topline == wp->w_lines[0].wl_lnum))
+		    || wp->w_topline <= wp->w_lines[0].wl_lnum))
 	{
 	    // w_topline is the first changed line and window is not scrolled,
 	    // the scrolling from changed lines will be done further down.
diff --git a/src/testdir/dumps/Test_display_scroll_at_topline.dump b/src/testdir/dumps/Test_display_scroll_at_topline.dump
new file mode 100644
index 0000000..9c843c0
--- /dev/null
+++ b/src/testdir/dumps/Test_display_scroll_at_topline.dump
@@ -0,0 +1,4 @@
+> +0&#ffffff0@19
+|a@19
+@1| @18
+|~+0#4040ff13&| @18
diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim
index 97b0a9e..49d0d8c 100644
--- a/src/testdir/test_display.vim
+++ b/src/testdir/test_display.vim
@@ -245,4 +245,16 @@
   call delete(filename)
 endfunc
 
+func Test_display_scroll_at_topline()
+  CheckScreendump
+
+  let buf = RunVimInTerminal('', #{cols: 20})
+  call term_sendkeys(buf, ":call setline(1, repeat('a', 21))\<CR>")
+  call term_wait(buf)
+  call term_sendkeys(buf, "O\<Esc>")
+  call VerifyScreenDump(buf, 'Test_display_scroll_at_topline', #{rows: 4})
+
+  call StopVimInTerminal(buf)
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 51b87ce..d6d1973 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1488,
+/**/
     1487,
 /**/
     1486,