diff --git a/mozilla/browser/components/bookmarks/content/addBookmark2.xul b/mozilla/browser/components/bookmarks/content/addBookmark2.xul
index 411fb845076..d0addf393c6 100644
--- a/mozilla/browser/components/bookmarks/content/addBookmark2.xul
+++ b/mozilla/browser/components/bookmarks/content/addBookmark2.xul
@@ -56,7 +56,7 @@
         ondialogextra2="newFolder()"
         ondialogaccept="return onOK(event)"
         buttons="accept,cancel" 
-        buttonlabelextra2="&newFolder.label;" buttonaccesskeyextra2="&newFolder.accesskey;"
+        buttonlabelextra2="&button.newfolder.label;" buttonaccesskeyextra2="&button.newfolder.accesskey;"
 #ifdef XP_UNIX
         buttonlabelaccept="&acceptButton.label;"
 #endif
diff --git a/mozilla/browser/locales/en-US/chrome/browser/bookmarks/addBookmark.dtd b/mozilla/browser/locales/en-US/chrome/browser/bookmarks/addBookmark.dtd
index 3ecfdf5ab0d..eb8367989c8 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/bookmarks/addBookmark.dtd
+++ b/mozilla/browser/locales/en-US/chrome/browser/bookmarks/addBookmark.dtd
@@ -14,7 +14,7 @@
 <!ENTITY moveto.label               "Move to:">
 <!ENTITY moveto.accesskey           "M">
 <!ENTITY button.newfolder.label     "New Folder...">
-<!ENTITY button.newfolder.accesskey "w">
+<!ENTITY button.newfolder.accesskey "o">
 <!ENTITY alwayscreateinfolder.label "Don't show this dialog again">
 <!ENTITY alwayscreateinfolder.accesskey "a">
 <!ENTITY dontshowmessage.tooltip    "When this option is selected, new Bookmarks will be added using the title provided by the page.">
@@ -26,6 +26,4 @@
 <!ENTITY expanderUp.tooltip      "Hide">
 <!ENTITY addGroup.label          "Bookmark all tabs in a folder">
 <!ENTITY addGroup.accesskey      "B">
-<!ENTITY newFolder.label         "New Folder...">
-<!ENTITY newFolder.accesskey     "N">
 <!ENTITY acceptButton.label      "Add">