diff --git a/common/content/editor.js b/common/content/editor.js
index 4fe4ed4b..237d0bcc 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -371,10 +371,14 @@ function Editor() //{{{
         { flags: Mappings.flags.COUNT });
 
     // visual mode
-    mappings.add([modes.CARET, modes.TEXTAREA, modes.VISUAL],
+    mappings.add([modes.CARET, modes.TEXTAREA],
         ["v"], "Start visual mode",
         function (count) { modes.set(modes.VISUAL, liberator.mode); });
 
+    mappings.add([modes.VISUAL],
+        ["v"], "End visual mode",
+        function (count) { events.onEscape() });
+
     mappings.add([modes.TEXTAREA],
         ["V"], "Start visual line mode",
         function (count)