diff --git a/common/locale/en-US/pattern.xml b/common/locale/en-US/pattern.xml
index e779db3c..6ecac3a0 100644
--- a/common/locale/en-US/pattern.xml
+++ b/common/locale/en-US/pattern.xml
@@ -45,7 +45,7 @@
 </p>
 
 <item>
-    <tags>/</tags>
+    <tags><![CDATA[<find-forward> /]]></tags>
     <spec>/<a>pattern</a><k name="CR"/></spec>
     <description>
         <p>Find <a>pattern</a> starting at the current caret position.</p>
@@ -75,7 +75,7 @@
 </item>
 
 <item>
-    <tags>?</tags>
+    <tags><![CDATA[<find-forward> ?]]></tags>
     <spec>?<a>pattern</a><k name="CR"/></spec>
     <description>
         <p>
@@ -86,7 +86,7 @@
 </item>
 
 <item>
-    <tags>n</tags>
+    <tags><![CDATA[<find-next> n]]></tags>
     <spec>n</spec>
     <description short="true">
         <p>Find next. Repeat the last find.</p>
@@ -94,7 +94,7 @@
 </item>
 
 <item>
-    <tags>N</tags>
+    <tags><![CDATA[<find-previous> N]]></tags>
     <spec>N</spec>
     <description short="true">
         <p>Find previous. Repeat the last find in the opposite direction.</p>
@@ -102,7 +102,7 @@
 </item>
 
 <item>
-    <tags>*</tags>
+    <tags><![CDATA[<find-word-next> *]]></tags>
     <spec>*</spec>
     <description short="true">
         <p>Search forward for the next occurrence of the word under cursor.</p>
@@ -110,7 +110,7 @@
 </item>
 
 <item>
-    <tags>#</tags>
+    <tags><![CDATA[<find-word-previous> #]]></tags>
     <spec>#</spec>
     <description short="true">
         <p>Search backward for the previous occurrence of the word under cursor.</p>
diff --git a/common/modules/finder.jsm b/common/modules/finder.jsm
index e8108215..a0c21bcc 100644
--- a/common/modules/finder.jsm
+++ b/common/modules/finder.jsm
@@ -225,29 +225,29 @@ var RangeFinder = Module("rangefinder", {
         var myModes = config.browserModes.concat([modes.CARET]);
 
         mappings.add(myModes,
-            ["/"], "Find a pattern starting at the current caret position",
+            ["/", "<find-forward>"], "Find a pattern starting at the current caret position",
             function () { rangefinder.openPrompt(modes.FIND_FORWARD); });
 
         mappings.add(myModes,
-            ["?"], "Find a pattern backward of the current caret position",
+            ["?", "<find-backward>"], "Find a pattern backward of the current caret position",
             function () { rangefinder.openPrompt(modes.FIND_BACKWARD); });
 
         mappings.add(myModes,
-            ["n"], "Find next",
+            ["n", "<find-next>"], "Find next",
             function () { rangefinder.findAgain(false); });
 
         mappings.add(myModes,
-            ["N"], "Find previous",
+            ["N", "<find-previous>"], "Find previous",
             function () { rangefinder.findAgain(true); });
 
-        mappings.add(myModes.concat([modes.CARET, modes.TEXT_EDIT]), ["*"],
+        mappings.add(myModes.concat([modes.CARET, modes.TEXT_EDIT]), ["*", "<find-word-forward>"],
             "Find word under cursor",
             function () {
                 rangefinder.find(Buffer.currentWord(buffer.focusedFrame, true), false);
                 rangefinder.findAgain();
             });
 
-        mappings.add(myModes.concat([modes.CARET, modes.TEXT_EDIT]), ["#"],
+        mappings.add(myModes.concat([modes.CARET, modes.TEXT_EDIT]), ["#", "<find-word-backward>"],
             "Find word under cursor backwards",
             function () {
                 rangefinder.find(Buffer.currentWord(buffer.focusedFrame, true), true);