diff --git a/src/testdir/test_virtualedit.vim b/src/testdir/test_virtualedit.vim
index 9f254c65a4..ec2b276c3f 100644
--- a/src/testdir/test_virtualedit.vim
+++ b/src/testdir/test_virtualedit.vim
@@ -598,6 +598,9 @@ func Test_virtualedit_mouse()
   call test_setmouse(row, 21 + 15)
   call feedkeys("\<LeftMouse>", "xt")
   call assert_equal([0, 1, 10, 2, 15], getcurpos())
+  call test_setmouse(row, 21 + 20)
+  call feedkeys("\<LeftMouse>", "xt")
+  call assert_equal([0, 1, 10, 7, 20], getcurpos())
 
   setlocal nowrap
   call setline(2, repeat('a', 19))
@@ -654,6 +657,23 @@ func Test_virtualedit_mouse()
     sign undefine Sign1
   endif
 
+  wincmd h
+  4wincmd >
+  normal! gg24I.
+  redraw
+  call test_setmouse(row + 1, 12)
+  call feedkeys("\<LeftMouse>", "xt")
+  call assert_equal([0, 1, 24 + 9, 0, 24 + 12], getcurpos())
+  call test_setmouse(row + 1, 13)
+  call feedkeys("\<LeftMouse>", "xt")
+  call assert_equal([0, 1, 24 + 10, 0, 24 + 13], getcurpos())
+  call test_setmouse(row + 1, 15)
+  call feedkeys("\<LeftMouse>", "xt")
+  call assert_equal([0, 1, 24 + 10, 2, 24 + 15], getcurpos())
+  call test_setmouse(row + 1, 20)
+  call feedkeys("\<LeftMouse>", "xt")
+  call assert_equal([0, 1, 24 + 10, 7, 24 + 20], getcurpos())
+
   bwipe!
   let &mouse = save_mouse
   set virtualedit&
diff --git a/src/version.c b/src/version.c
index 54ab5539d0..7978aa0bf0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1937,
 /**/
     1936,
 /**/