diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index d65c700fd62..5c71e31ca14 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1061,9 +1061,8 @@
   <hbox flex="1" id="browser">
     <vbox id="sidebar-box" hidden="true">
       <sidebarheader align="center">
-        <label id="sidebar-title" persist="value"/>
+        <label id="sidebar-title" persist="value" flex="1" crop="end"/>
         <image id="sidebar-throbber"/>
-        <spacer flex="1"/>
         <toolbarbutton class="tabs-closebutton" oncommand="toggleSidebar();"/>      
       </sidebarheader>        
       <browser id="sidebar" flex="1" autoscroll="false"
diff --git a/browser/base/content/web-panels.js b/browser/base/content/web-panels.js
index 1454e0b9313..631856d4e72 100644
--- a/browser/base/content/web-panels.js
+++ b/browser/base/content/web-panels.js
@@ -45,22 +45,28 @@ var panelProgressListener = {
     }
 };
 
-var gLoadCachedSrc = true;
+var gLoadFired = false;
 function loadWebPanel(aURI) {
     var panelBrowser = document.getElementById('web-panels-browser');
     panelBrowser.removeAttribute("src");
+    panelBrowser.removeAttribute("cachedurl");
+    if (!gLoadFired)
+      load();
     panelBrowser.setAttribute("src", aURI);
     panelBrowser.setAttribute("cachedurl", aURI);
-    gLoadCachedSrc = false;
 }
 
 function load()
 {
+  if (gLoadFired)
+    return;
+
   var panelBrowser = document.getElementById('web-panels-browser');
   panelBrowser.webProgress.addProgressListener(panelProgressListener, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
-  if (gLoadCachedSrc && panelBrowser.getAttribute("cachedurl")) {
+  if (panelBrowser.getAttribute("cachedurl")) {
     panelBrowser.setAttribute("src", panelBrowser.getAttribute("cachedurl"));
   }
+  gLoadFired = true;
 }
 
 function unload()