diff --git a/src/normal.c b/src/normal.c
index 5634925..e44b513 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -5527,12 +5527,13 @@
 
 /*
  * Start Select mode, if "c" is in 'selectmode' and not in a mapping or menu.
+ * When "c" is 'o' (checking for "mouse") then also when mapped.
  */
     void
 may_start_select(int c)
 {
-    VIsual_select = (stuff_empty() && typebuf_typed()
-		    && (vim_strchr(p_slm, c) != NULL));
+    VIsual_select = (c == 'o' || (stuff_empty() && typebuf_typed()))
+		    && vim_strchr(p_slm, c) != NULL;
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index 28ac75e..6df25da 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4806,
+/**/
     4805,
 /**/
     4804,