diff --git a/src/move.c b/src/move.c
index fb03393..21a74b8 100644
--- a/src/move.c
+++ b/src/move.c
@@ -2847,6 +2847,8 @@
 # ifdef FEAT_VIRTUALEDIT
     colnr_T	coladd = curwin->w_cursor.coladd;
 # endif
+    colnr_T	curswant = curwin->w_curswant;
+    int		set_curswant = curwin->w_set_curswant;
     win_T	*old_curwin = curwin;
     buf_T	*old_curbuf = curbuf;
     int		restart_edit_save;
@@ -2881,6 +2883,8 @@
 # ifdef FEAT_VIRTUALEDIT
 	    curwin->w_cursor.coladd = coladd;
 # endif
+	    curwin->w_curswant = curswant;
+	    curwin->w_set_curswant = set_curswant;
 
 	    /* Make sure the cursor is in a valid position.  Temporarily set
 	     * "restart_edit" to allow the cursor to be beyond the EOL. */
diff --git a/src/version.c b/src/version.c
index a1bd77c..b9df085 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    482,
+/**/
     481,
 /**/
     480,