diff --git a/common/content/editor.js b/common/content/editor.js
index 3a4c7b7a..7760fcf4 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -570,7 +570,8 @@ const Editor = Module("editor", {
             ["<S-Insert>"], "Insert clipboard/selection",
             function () { editor.pasteClipboard(); });
 
-        mappings.add(modes.getCharModes("i"),
+        // TODO: a better way to specify mode types
+        mappings.add(modes.getCharModes("i").concat(modes.TEXT_EDIT, modes.COMMAND_LINE),
             ["<C-i>"], "Edit text field with an external editor",
             function () { editor.editFieldExternally(); });
 
diff --git a/common/locale/en-US/cmdline.xml b/common/locale/en-US/cmdline.xml
index 2a9e3e1c..b7f03732 100644
--- a/common/locale/en-US/cmdline.xml
+++ b/common/locale/en-US/cmdline.xml
@@ -48,6 +48,14 @@
 
 <h2 tag="cmdline-editing">Command line editing</h2>
 
+<item>
+    <tags><![CDATA[c_<C-i>]]></tags>
+    <spec>&lt;C-i></spec>
+    <description short="true">
+        <p>Launch the external editor. See the <o>editor</o> option.</p>
+    </description>
+</item>
+
 <item>
     <tags><![CDATA[c_<C-c>]]></tags>
     <spec>&lt;C-c></spec>
diff --git a/common/locale/en-US/insert.xml b/common/locale/en-US/insert.xml
index da195f63..594ed56e 100644
--- a/common/locale/en-US/insert.xml
+++ b/common/locale/en-US/insert.xml
@@ -140,6 +140,14 @@
 
 <h2 tag="text-edit-mode text-edit tedit-mode">Text Edit mode</h2>
 
+<item>
+    <tags><![CDATA[t_<C-i>]]></tags>
+    <spec>&lt;C-i></spec>
+    <description short="true">
+        <p>Launch the external editor. See the <o>editor</o> option.</p>
+    </description>
+</item>
+
 <h3 tag="tedit-cursor-motions">Cursor motions</h3>
 
 <p>Left-right motions</p>