diff --git a/src/popupmnu.c b/src/popupmnu.c
index 2f2bde0..755dba4 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -368,7 +368,7 @@
     // Update the cursor position to be able to compute the popup menu
     // position.  The cursor line length may have changed because of the
     // inserted completion.
-    curwin->w_valid &= VALID_CROW|VALID_CHEIGHT;
+    curwin->w_valid &= ~(VALID_CROW|VALID_CHEIGHT);
     validate_cursor();
 }
 
diff --git a/src/screen.c b/src/screen.c
index 570910e..1370773 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3712,6 +3712,7 @@
     {
 	line_attr = HL_ATTR(HLF_CUL);
 	area_highlighting = TRUE;
+	wp->w_last_cursorline = wp->w_cursor.lnum;
     }
 #endif
 
diff --git a/src/testdir/dumps/Test_cursorline_yank_01.dump b/src/testdir/dumps/Test_cursorline_yank_01.dump
new file mode 100644
index 0000000..3de1bff
--- /dev/null
+++ b/src/testdir/dumps/Test_cursorline_yank_01.dump
@@ -0,0 +1,8 @@
+| +0#af5f00255#ffffff0@1|3| | +0#0000000&@70
+| +0#af5f00255&@1|2| |1+0#0000000&| @69
+| +0#af5f00255&@1|1| |2+0#0000000&| @69
+| +0#af5f00255&@1|0| >3+8#0000000&| @69
+| +0#af5f00255&@1|1| | +0#0000000&@70
+|~+0#4040ff13&| @73
+|~| @73
+|4+0#0000000&| |l|i|n|e|s| |y|a|n|k|e|d| @42|4|,|1| @10|A|l@1| 
diff --git a/src/testdir/test_highlight.vim b/src/testdir/test_highlight.vim
index 67c7506..b37684c 100644
--- a/src/testdir/test_highlight.vim
+++ b/src/testdir/test_highlight.vim
@@ -1,6 +1,7 @@
 " Tests for ":highlight" and highlighting.
 
 source view_util.vim
+source screendump.vim
 
 func Test_highlight()
   " basic test if ":highlight" doesn't crash
@@ -129,10 +130,6 @@
 endfunc
 
 func Test_highlight_eol_with_cursorline_vertsplit()
-  if !has('vertsplit')
-    return
-  endif
-
   let [hiCursorLine, hi_ul, hi_bg] = HiCursorLine()
 
   call NewWindow('topleft 5', 5)
@@ -533,3 +530,25 @@
   set t_Co=0
   redraw
 endfunc
+
+func Test_cursorline_after_yank()
+  if !CanRunVimInTerminal()
+    return
+  endif
+
+  call writefile([
+	\ 'set cul rnu',
+	\ 'call setline(1, ["","1","2","3",""])',
+	\ ], 'Xtest_cursorline_yank')
+  let buf = RunVimInTerminal('-S Xtest_cursorline_yank', {'rows': 8})
+  call term_wait(buf)
+  call term_sendkeys(buf, "Gy3k")
+  call term_wait(buf)
+  call term_sendkeys(buf, "jj")
+
+  call VerifyScreenDump(buf, 'Test_cursorline_yank_01', {})
+
+  " clean up
+  call StopVimInTerminal(buf)
+  call delete('Xtest_cursorline_yank')
+endfunc
diff --git a/src/version.c b/src/version.c
index 114539a..864ca44 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    849,
+/**/
     848,
 /**/
     847,