diff --git a/src/buffer.c b/src/buffer.c
index 3bfd975220..55e200ab88 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -580,7 +580,11 @@ aucmd_abort:
 
     /* When closing the current buffer stop Visual mode before freeing
      * anything. */
-    if (buf == curbuf)
+    if (buf == curbuf
+#if defined(EXITFREE)
+	    && !entered_free_all_mem
+#endif
+	    )
 	end_visual_mode();
 
     /*
diff --git a/src/version.c b/src/version.c
index 8740a985e2..b2b9334e8c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2348,
 /**/
     2347,
 /**/