diff --git a/mozilla/suite/browser/navigatorOverlay.xul b/mozilla/suite/browser/navigatorOverlay.xul
index 6aac481466b..391a8017792 100644
--- a/mozilla/suite/browser/navigatorOverlay.xul
+++ b/mozilla/suite/browser/navigatorOverlay.xul
@@ -46,7 +46,8 @@
 	<key id="key_newBlankPage"/>
 	<key id="openBrowserKb"      key="&openCmd.commandkey;" observes="Browser:Open"  modifiers="accel"/>
 	<key id="openFileKb"         key="&openFileCmd.commandkey;" observes="Browser:OpenFile"  modifiers="accel"/>
-	<key id="key_savePage"        key="&savePageCmd.commandkey;" observes="Browser:SavePage" modifiers="accel"/>
+	<key id="key_savePage"       key="&savePageCmd.commandkey;" observes="Browser:SavePage" modifiers="accel"/>
+	<key id="key_editPage"       key="&editPageCmd.commandkey;" observes="Browser:EditPage" modifiers="accel"/>
 	<key id="printKb"            key="&printCmd.commandkey;" observes="Browser:Print"  modifiers="accel"/>
 	<key id="key_close"/>
 	<key id="key_quit"/>
@@ -100,7 +101,7 @@
 	<broadcaster id="Browser:OpenFile"  value="&openFileCmd.label;" oncommand="BrowserOpenFileWindow();"/>
 	<broadcaster id="cmd_close" oncommand="BrowserClose()"/>
 	<broadcaster id="Browser:SavePage" value="&savePageCmd.label;" accesskey="&savePageCmd.accesskey;" oncommand="savePage();"/>
-	<broadcaster id="Browser:EditPage"  value="&editPageCmd.label;" oncommand="BrowserEditPage(window._content.location.href);"/>
+	<broadcaster id="Browser:EditPage" value="&editPageCmd.label;" oncommand="BrowserEditPage(window._content.location.href);"/>
 	<broadcaster id="Browser:PrintSetup"  value="&printSetupCmd.label;"     disabled ="true" oncommand="BrowserReload();"/>
 	<broadcaster id="Browser:PrintPreview"  value="&printPreviewCmd.label;" disabled="true"  oncommand="BrowserReload();"/>
 	<broadcaster id="Browser:Print"  value="&printCmd.label;"        						 oncommand="BrowserPrint();"/>
@@ -164,7 +165,7 @@
 		    <menuitem id="context-savepage" key="key_savePage" observes="Browser:SavePage"/>
 		    <menuitem id="savepage" value="&saveFrameCmd.label;" accesskey="&saveFrameCmd.accesskey;" oncommand="savePage(gFocusedURL);" hidden="true"/>
 	      <menuseparator id="file_moduleSeparator"/>
-	      <menuitem accesskey="&editPageCmd.accesskey;" observes="Browser:EditPage" />
+	      <menuitem accesskey="&editPageCmd.accesskey;" key="key_editPage" observes="Browser:EditPage" />
 	      <menuseparator/>
 	      <menuitem accesskey="&printSetupCmd.accesskey;" observes="Browser:PrintSetup"/>
 	      <menuitem accesskey="&printPreviewCmd.accesskey;" observes="Browser:PrintPreview"/>
diff --git a/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd b/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
index 246d98edb35..8d2145fdb3c 100644
--- a/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/mozilla/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -23,6 +23,7 @@
 <!ENTITY openFileCmd.commandkey "o">
 <!ENTITY editPageCmd.label					"Edit Page">
 <!ENTITY editPageCmd.accesskey				"d">
+<!ENTITY editPageCmd.commandkey				"e">
 <!ENTITY editFrameCmd.label					"Edit Frame">
 <!ENTITY editFrameCmd.accesskey				"m">
 <!ENTITY editFrameSetCmd.label		  "Edit Frameset">
@@ -338,7 +339,7 @@
 <!ENTITY bookmarkPageCmd.accesskey    "b">
 <!ENTITY bookmarkLinkCmd.label        "Bookmark this Link">
 <!ENTITY bookmarkLinkCmd.accesskey    "b">
-<!ENTITY savePageCmd.label            "Save Page As...">
+<!ENTITY savePageCmd.label            "Save As...">
 <!ENTITY savePageCmd.accesskey        "s">
 <!ENTITY savePageCmd.commandkey       "s">
 <!ENTITY saveFrameCmd.label           "Save Frame As...">