diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 7f49883fa8e..37ea4948028 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -411,6 +411,15 @@ var Browser = {
       // Tell the UI to resize the browser controls
       BrowserUI.sizeControls(w, h);
 
+      // XXX During the launch, the resize of the window arrive after we add
+      // the first tab, so we need to force the viewport state for this case
+      // see bug 558840
+      let bvs = bv._browserViewportState;
+      if (bvs.viewportRect.width == 1 && bvs.viewportRect.height == 1) {
+        bvs.viewportRect.width = window.innerWidth;
+        bvs.viewportRect.height = window.innerHeight;
+      }
+
       bv.updateDefaultZoom();
       if (bv.isDefaultZoom())
         // XXX this should really only happen on browser startup, not every resize
@@ -3175,7 +3184,9 @@ Tab.prototype = {
     if (!this._browser)
       return;
 
-    let browserView = (Browser.selectedBrowser == this._browser) ? Browser._browserView : null;
+    let bv = Browser._browserView;
+    let browserView = (Browser.selectedBrowser == this._browser && bv.isDefaultZoom()) ? Browser._browserView 
+                                                                                       : null;
     this._chromeTab.updateThumbnail(this._browser, browserView);
   },