diff --git a/mozilla/extensions/manticore/browser/browserwindow.cs b/mozilla/extensions/manticore/browser/browserwindow.cs
index 3164182546a..77866a06c18 100644
--- a/mozilla/extensions/manticore/browser/browserwindow.cs
+++ b/mozilla/extensions/manticore/browser/browserwindow.cs
@@ -121,10 +121,11 @@ namespace Silverstone.Manticore.BrowserWindow
 	    mToolbarBuilder = new BrowserToolbarBuilder("browser\\browser-toolbar.xml", mCommandHandler, this);
 	    mToolbarBuilder.Build();
 
-      LoadStartPage();
+      // Start Page handler
+      this.VisibleChanged += new EventHandler(LoadStartPage);
     }
 
-    private void LoadStartPage()
+    private void LoadStartPage(object sender, EventArgs e)
     {
       int startMode = application.Prefs.GetIntPref("browser.homepage.mode");
       switch (startMode) {
diff --git a/mozilla/extensions/manticore/layout/layoutabstraction.cs b/mozilla/extensions/manticore/layout/layoutabstraction.cs
index 97ee0dd0ae8..7474b396aad 100644
--- a/mozilla/extensions/manticore/layout/layoutabstraction.cs
+++ b/mozilla/extensions/manticore/layout/layoutabstraction.cs
@@ -63,7 +63,6 @@ namespace Silverstone.Manticore.LayoutAbstraction
     {
       if (gecko == null && trident == null)
         SwitchLayoutEngine("gecko"); // XXX Should be pref-based.
-      Show();
     }
 
     public void SwitchLayoutEngine(String id)