diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index a42755eeb36..0154fbf9401 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -300,6 +300,25 @@ function Startup()
   // tasks BEFORE the browser window is shown.   
   var obs = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
   obs.notifyObservers(null, "browser-window-before-show", "");
+
+  // Set a sane starting width/height for all resolutions on new profiles.
+  if (!document.documentElement.hasAttribute("width")) {
+    var defaultWidth = 994, defaultHeight;
+    if (screen.availHeight <= 600) {
+      document.documentElement.setAttribute("sizemode", "maximized");
+      defaultWidth = 610;
+      defaultHeight = 450;
+    }
+    else {
+      // Create a narrower window for large or wide-aspect displays, to suggest
+      // side-by-side page view. 
+      if ((screen.availWidth / 2) >= 800)
+        defaultWidth = (screen.availWidth / 2) - 20;
+      defaultHeight = screen.availHeight - 10;
+    }
+    document.documentElement.setAttribute("width", defaultWidth);
+    document.documentElement.setAttribute("height", defaultHeight);
+  }
   
   setTimeout(delayedStartup, 0);
 }
diff --git a/mozilla/browser/base/content/browser.xul b/mozilla/browser/base/content/browser.xul
index e6d4aca5476..6cc95993fc6 100644
--- a/mozilla/browser/base/content/browser.xul
+++ b/mozilla/browser/base/content/browser.xul
@@ -46,7 +46,6 @@
         titlemodifier="&mainWindow.title;"
         titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
         windowtype="navigator:browser"
-        width="610" height="450"
         screenX="4" screenY="4"
         persist="screenX screenY width height sizemode">