diff --git a/common/content/editor.js b/common/content/editor.js
index c27b8b9e..ffbe217c 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -662,7 +662,7 @@ var Editor = Module("editor", {
 
         mappings.add([modes.VISUAL],
             ["v", "V"], "End visual mode",
-            function () { events.onEscape(); }); // XXX
+            function () { modes.pop(); });
 
         mappings.add([modes.TEXT_EDIT],
             ["V"], "Start visual line mode",