diff --git a/common/content/modes.js b/common/content/modes.js
index 9c02b966..33c60cdd 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -80,6 +80,7 @@ var Modes = Module("modes", {
             }
         });
         this.addMode("CARET", {
+            char: "caret",
             description: "Active when the caret is visible in the web content",
             bases: [this.NORMAL]
         }, {
diff --git a/common/locale/en-US/index.xml b/common/locale/en-US/index.xml
index 99b3c79a..d6a9981b 100644
--- a/common/locale/en-US/index.xml
+++ b/common/locale/en-US/index.xml
@@ -26,6 +26,8 @@ This file contains a list of all available commands, mappings and options.
 
 <h2 tag="n-map-index">Normal mode</h2>
 
+<h2 tag="caret-map-index">Caret mode</h2>
+
 <h2 tag="v-map-index">Visual mode</h2>
 
 <h2 tag="c-map-index">Command-line editing</h2>
diff --git a/common/locale/en-US/various.xml b/common/locale/en-US/various.xml
index a98371ef..e54bec3f 100644
--- a/common/locale/en-US/various.xml
+++ b/common/locale/en-US/various.xml
@@ -261,7 +261,7 @@
     <description>
         <p>
             Start Caret mode. This mode resembles Vim's Normal mode where the
-            text cursor is visible on the web page. The <k link="false">v</k>
+            text cursor is visible on the web page. The <k mode="caret">v</k>
             key enters Visual mode, where text is selected as the cursor moves.
         </p>
         <p>
diff --git a/common/modules/buffer.jsm b/common/modules/buffer.jsm
index 4ed94c50..9788c22c 100644
--- a/common/modules/buffer.jsm
+++ b/common/modules/buffer.jsm
@@ -1569,6 +1569,7 @@ var Buffer = Module("Buffer", {
                         let file = io.File(filename.replace(/^>>\s*/, ""));
                         dactyl.assert(args.bang || file.exists() && file.isWritable(),
                                       _("io.notWriteable", file.path.quote()));
+
                         return buffer.viewSourceExternally(buffer.focusedFrame.document,
                             function (tmpFile) {
                                 try {
@@ -1580,7 +1581,7 @@ var Buffer = Module("Buffer", {
                             });
                     }
 
-                    let file = io.File(filename.replace(RegExp(File.PATH_SEP + "*$"), ""));
+                    let file = io.File(filename);
 
                     if (filename.substr(-1) === File.PATH_SEP || file.exists() && file.isDirectory())
                         file.append(Buffer.getDefaultNames(doc)[0][0]);