diff --git a/src/buffer.c b/src/buffer.c
index cb7bdf4..ff35729 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5402,6 +5402,10 @@
     else
 	all = TRUE;
 
+    // Stop Visual mode, the cursor and "VIsual" may very well be invalid after
+    // switching to another buffer.
+    reset_VIsual_and_resel();
+
     setpcmark();
 
 #ifdef FEAT_GUI