diff --git a/browser/components/sessionstore/src/nsSessionStartup.js b/browser/components/sessionstore/src/nsSessionStartup.js
index 1795306b78e..5c7e125411d 100644
--- a/browser/components/sessionstore/src/nsSessionStartup.js
+++ b/browser/components/sessionstore/src/nsSessionStartup.js
@@ -276,7 +276,7 @@ SessionStartup.prototype = {
         var ssStringBundle = this._getStringBundle("chrome://browser/locale/sessionstore.properties");
         var restoreTitle = ssStringBundle.formatStringFromName("restoredTitle", [brandShortName], 1);
         var restoreText = ssStringBundle.formatStringFromName("restoredMsg", [brandShortName], 1);
-        var buttonTitle = ssStringBundle.GetStringFromName("buttonTitle");
+        var okTitle = ssStringBundle.GetStringFromName("okTitle");
         var cancelTitle = ssStringBundle.GetStringFromName("cancelTitle");
 
         var promptService = Cc["@mozilla.org/embedcomp/prompt-service;1"].
@@ -288,7 +288,7 @@ SessionStartup.prototype = {
                     promptService.BUTTON_POS_0_DEFAULT;
         
         var buttonChoice = promptService.confirmEx(null, restoreTitle, restoreText, 
-                                          flags, buttonTitle, cancelTitle, null, 
+                                          flags, okTitle, cancelTitle, null, 
                                           null, {});
         recover = (buttonChoice == 0);
       }
diff --git a/browser/locales/en-US/chrome/browser/sessionstore.properties b/browser/locales/en-US/chrome/browser/sessionstore.properties
index d064bd16d45..ffd54e423af 100644
--- a/browser/locales/en-US/chrome/browser/sessionstore.properties
+++ b/browser/locales/en-US/chrome/browser/sessionstore.properties
@@ -1,4 +1,7 @@
 restoredTitle= %S - Restore Previous Session 
 restoredMsg=Your last %S session closed unexpectedly. You can restore the tabs and windows from your previous session, or start a new session if you think the problem was related to a page you were viewing.
-buttonTitle=Restore Session
+
+# Localization note: It is recommended that okTitle be longer than cancelTitle
+# so that hitting the more prominent button doesn't lead to dataloss (see bug 346264).
+okTitle=Restore Previous Session
 cancelTitle=Start New Session