diff --git a/browser/base/content/openLocation.js b/browser/base/content/openLocation.js
index 5f10b51c65ea..0dba25dc3022 100644
--- a/browser/base/content/openLocation.js
+++ b/browser/base/content/openLocation.js
@@ -45,9 +45,6 @@ function onLoad()
    
   dialog.openWhereList.selectedItem = dialog.openTopWindow;
 
-  // change OK button text to 'open'
-  dialog.open.label = dialog.bundle.getString("openButtonLabel");
-
   if (pref) {
     try {
       var value = pref.getIntPref("general.open_location.last_window_choice");
diff --git a/browser/base/content/openLocation.xul b/browser/base/content/openLocation.xul
index 9a8658d147ce..f0b11aa24879 100644
--- a/browser/base/content/openLocation.xul
+++ b/browser/base/content/openLocation.xul
@@ -31,6 +31,7 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&caption.label;"
         onload="onLoad()"
+        buttonlabelaccept="&openBtn.label;"
         ondialogaccept="open()"
         style="width: 40em;"
         persist="screenX screenY"
diff --git a/browser/base/locale/openLocation.dtd b/browser/base/locale/openLocation.dtd
index c8ca6c72cc77..ae946d4b1a37 100644
--- a/browser/base/locale/openLocation.dtd
+++ b/browser/base/locale/openLocation.dtd
@@ -2,11 +2,10 @@
 
 <!ENTITY enter.label "Enter the web location (URL), or specify the local file you would like to open:">  
 <!ENTITY chooseFile.label "Choose File...">
-<!ENTITY newWindow.label "New Navigator window">
-<!ENTITY newTab.label "New Navigator tab">
-<!ENTITY topWindow.label "Current Navigator window">
-<!ENTITY editNewWindow.label "New Composer window">
-<!ENTITY cancel.label "Cancel">
+<!ENTITY newWindow.label "New Window">
+<!ENTITY newTab.label "New Tab">
+<!ENTITY topWindow.label "Current Window">
 <!ENTITY caption.label "Open Web Location">
 <!ENTITY openWhere.label "Open in:">
 <!ENTITY example.label "Example: &vendorURL;">
+<!ENTITY openBtn.label "Open">
\ No newline at end of file
diff --git a/browser/base/locale/openLocation.properties b/browser/base/locale/openLocation.properties
index 876f630733ad..b05c2d9605e8 100644
--- a/browser/base/locale/openLocation.properties
+++ b/browser/base/locale/openLocation.properties
@@ -1,2 +1 @@
-openButtonLabel=Open
 chooseFileDialogTitle=Choose File