diff --git a/mozilla/toolkit/components/typeaheadfind/content/findBar.inc b/mozilla/toolkit/components/typeaheadfind/content/findBar.inc
index 57d1467664a..9638deca2b5 100755
--- a/mozilla/toolkit/components/typeaheadfind/content/findBar.inc
+++ b/mozilla/toolkit/components/typeaheadfind/content/findBar.inc
@@ -8,13 +8,13 @@
                 onkeypress="onFindBarKeyPress(event);" onblur="onFindBarBlur();"/>
       </hbox>
       <toolbarbutton id="find-next" label="&findNext.label;" tooltiptext="&findNext.tooltip;"
-                     command="cmd_findAgain" disabled="true"/>
+                     command="cmd_findAgain" disabled="true" accesskey="&findNext.accesskey;"/>
       <toolbarbutton id="find-previous" label="&findPrevious.label;" tooltiptext="&findPrevious.tooltip;"
-                     command="cmd_findPrevious" disabled="true"/>
+                     command="cmd_findPrevious" disabled="true" accesskey="&findPrevious.accesskey;"/>
       <toolbarbutton id="highlight" label="&highlight.label;" tooltiptext="&highlight.tooltip;"
                      oncommand="toggleHighlight(!this.checked);
                                 if (gFindMode != FIND_NORMAL) setFindCloseTimeout();"
-                     type="checkbox" disabled="true"/>
+                     type="checkbox" disabled="true" accesskey="&highlight.accesskey;"/>
       <checkbox id="find-case-sensitive" oncommand="toggleCaseSensitivity(this.checked);"
                 label="&caseSensitiveCheckbox.label;" accesskey="&caseSensitiveCheckbox.accesskey;"/>
       <image id="find-status-icon"/>
diff --git a/mozilla/toolkit/components/typeaheadfind/content/findBar.js b/mozilla/toolkit/components/typeaheadfind/content/findBar.js
index 5cfcca3f950..7260fa44c41 100755
--- a/mozilla/toolkit/components/typeaheadfind/content/findBar.js
+++ b/mozilla/toolkit/components/typeaheadfind/content/findBar.js
@@ -472,12 +472,7 @@ function onFindBarKeyPress(evt)
     var findString = document.getElementById("find-field");
     if (!findString.value)
       return;
-      
-    if (evt.ctrlKey) {
-      document.getElementById("highlight").click();
-      return;
-    }
-    
+
     if (evt.shiftKey)
       findPrevious();
     else
diff --git a/mozilla/toolkit/locales/en-US/chrome/global/findbar.dtd b/mozilla/toolkit/locales/en-US/chrome/global/findbar.dtd
index 5ab89c3db4c..4ba8c5d145f 100644
--- a/mozilla/toolkit/locales/en-US/chrome/global/findbar.dtd
+++ b/mozilla/toolkit/locales/en-US/chrome/global/findbar.dtd
@@ -4,12 +4,15 @@
 <!-- entities split out from browser.dtd -->
 <!ENTITY find.label "Find:">
 <!ENTITY findNext.label "Find Next">
+<!ENTITY findNext.accesskey "N">
 <!ENTITY findNext.tooltip "Find the next occurrence of the phrase">
 <!ENTITY findPrevious.label "Find Previous">
+<!ENTITY findPrevious.accesskey "P">
 <!ENTITY findPrevious.tooltip "Find the previous occurrence of the phrase">
 <!ENTITY findCloseButton.tooltip "Close Find bar">
-<!ENTITY highlight.label "Highlight">
-<!ENTITY highlight.tooltip "Highlight all occurrences of the phrase (Ctrl+Enter)">
+<!ENTITY highlight.label "Highlight all">
+<!ENTITY highlight.accesskey "a">
+<!ENTITY highlight.tooltip "Highlight all occurrences of the phrase">
 <!ENTITY caseSensitiveCheckbox.label "Match case">
 <!ENTITY caseSensitiveCheckbox.accesskey "c">