diff --git a/src/normal.c b/src/normal.c
index 2f2a560179..3f32293360 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1154,7 +1154,8 @@ end_visual_mode_keep_button(void)
     // we need to paste it somewhere while we still own the selection.
     // Only do this when the clipboard is already owned.  Don't want to grab
     // the selection when hitting ESC.
-    if (clip_star.available && clip_star.owned)
+    if ((clip_star.available && clip_star.owned)
+	    || (clip_plus.available && clip_plus.owned))
 	clip_auto_select();
 
 # if defined(FEAT_EVAL)
diff --git a/src/version.c b/src/version.c
index ba16b51701..e4bee056d8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2057,
 /**/
     2056,
 /**/