diff --git a/src/testdir/dumps/Test_hor_scroll_5.dump b/src/testdir/dumps/Test_hor_scroll_5.dump
new file mode 100644
index 0000000..f2986f3
--- /dev/null
+++ b/src/testdir/dumps/Test_hor_scroll_5.dump
@@ -0,0 +1,8 @@
+|k+0&#ffffff0@1| |l@1| |m@1| |n@1| |o@1| |p@1| |q@1||+1&&|a+0&&@1| |b@1| |c@1| |d@1| |e@1| |f@1| |g@1| |h@1| |i@1| |j@1| |k@1| |l@1| |m@1| |n>n| |o@1| |p@1| |q@1| |r@1| 
+@20||+1&&| +0&&@53
+@20||+1&&| +0&&@53
+@20||+1&&| +0&&@53
+@20||+1&&| +0&&@53
+|~+0#4040ff13&| @18||+1#0000000&|~+0#4040ff13&| @52
+|<+1#0000000&|a|m|e|]| |[|+|]| |1|,|4|1| @2|A|l@1| |[+3&&|N|o| |N|a|m|e|]| |[|+|]| @22|1|,|4|1| @10|A|l@1
+|:+0&&|w|i|n|d|o| |:|s|e|t| |n|o|c|u|r|s|o|r|l|i|n|e| |n|o|c|u|r|s|o|r|c|o|l|u|m|n| @35
diff --git a/src/testdir/test_cursorline.vim b/src/testdir/test_cursorline.vim
index e7c2d0b..e5b2113 100644
--- a/src/testdir/test_cursorline.vim
+++ b/src/testdir/test_cursorline.vim
@@ -297,7 +297,7 @@
   CheckScreendump
 
   let lines =<< trim END
-      call setline(1, 'aa bb cc dd ee ff gg hh ii jj kk ll mm' .. 
+      call setline(1, 'aa bb cc dd ee ff gg hh ii jj kk ll mm' ..
       \ ' nn oo pp qq rr ss tt uu vv ww xx yy zz')
       set nowrap
       " The following makes the cursor apparent on the screen dump
@@ -320,6 +320,10 @@
   call VerifyScreenDump(buf, 'Test_hor_scroll_3', {})
   call term_sendkeys(buf, "10l")
   call VerifyScreenDump(buf, 'Test_hor_scroll_4', {})
+  call term_sendkeys(buf, ":windo :set nocursorline nocursorcolumn\<cr>")
+  call term_sendkeys(buf, "0")
+  call term_sendkeys(buf, "40l")
+  call VerifyScreenDump(buf, 'Test_hor_scroll_5', {})
 
   call StopVimInTerminal(buf)
   call delete('Xhor_scroll')
diff --git a/src/version.c b/src/version.c
index 4c19455..ded3a61 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4801,
+/**/
     4800,
 /**/
     4799,