diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index aa8d9765f518..faa700b437d7 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -745,16 +745,11 @@ var Browser = {
     if (this._selectedTab.isLoading())
       BrowserUI.lockToolbar();
 
-    if (oldBrowser) {
-      oldBrowser.setAttribute("type", "content");
-      oldBrowser.messageManager.sendAsyncMessage("Browser:Blur", {});
-    }
+    if (lastTab)
+      lastTab.updateBrowser(false);
 
-    if (browser) {
-      browser.setAttribute("type", "content-primary");
-      Elements.browsers.selectedPanel = browser;
-      browser.messageManager.sendAsyncMessage("Browser:Focus", {});
-    }
+    if (tab)
+      tab.updateBrowser(true);
 
     document.getElementById("tabs").selectedTab = tab.chromeTab;
 
@@ -803,22 +798,8 @@ var Browser = {
   },
 
   getNotificationBox: function getNotificationBox(aBrowser) {
-    return document.getElementById("notifications");
-  },
-
-  removeTransientNotificationsForTab: function removeTransientNotificationsForTab(aTab) {
-    let notificationBox = this.getNotificationBox();
-    let notifications = notificationBox.allNotifications;
-    for (let n = notifications.length - 1; n >= 0; n--) {
-      let notification = notifications[n];
-      if (notification._chromeTab != aTab.chromeTab)
-        continue;
-
-      if (notification.persistence)
-        notification.persistence--;
-      else if (Date.now() > notification.timeout)
-        notificationBox.removeNotification(notification);
-    }
+    let browser = aBrowser || this.selectedBrowser;
+    return browser.parentNode;
   },
 
   /**
@@ -2329,7 +2310,7 @@ ProgressController.prototype = {
       TapHighlightHelper.hide();
 
       this.browser.lastLocation = location;
-      Browser.removeTransientNotificationsForTab(this._tab);
+      Browser.getNotificationBox(this.browser).removeTransientNotifications();
       this._tab.resetZoomLevel();
 
       if (this._tab == Browser.selectedTab) {
@@ -2633,6 +2614,9 @@ Tab.prototype = {
   _createBrowser: function _createBrowser(aURI, aInsertBefore) {
     if (this._browser)
       throw "Browser already exists";
+ 
+    // Create a notification box around the browser
+    let notification = this._notification = document.createElement("notificationbox");
 
     // Create the browser using the current width the dynamically size the height
     let browser = this._browser = document.createElement("browser");
@@ -2646,7 +2630,8 @@ Tab.prototype = {
     browser.setAttribute("remote", (!useLocal && useRemote) ? "true" : "false");
 
     // Append the browser to the document, which should start the page load
-    Elements.browsers.insertBefore(browser, aInsertBefore);
+    notification.appendChild(browser);
+    Elements.browsers.insertBefore(notification, aInsertBefore);
 
     // stop about:blank from loading
     browser.stop();
@@ -2766,6 +2751,21 @@ Tab.prototype = {
     this._chromeTab.updateThumbnail(browser, browser.contentWindowWidth, browser.contentWindowHeight);
   },
 
+  updateBrowser: function updateBrowser(aDisplay) {
+    let notification = this._notification;
+    let browser = this._browser;
+    if (aDisplay) {
+      browser.setAttribute("type", "content-primary");
+      notification.style.display = "";
+      browser.messageManager.sendAsyncMessage("Browser:Focus", {});
+    }
+    else {
+      browser.setAttribute("type", "content");
+      notification.style.display = "none";
+      browser.messageManager.sendAsyncMessage("Browser:Blur", {});
+    }
+  },
+
   toString: function() {
     return "[Tab " + (this._browser ? this._browser.currentURI.spec : "(no browser)") + "]";
   }
diff --git a/mobile/chrome/content/notification.xml b/mobile/chrome/content/notification.xml
index 267c5f2bc5b4..2dfa758f64b9 100644
--- a/mobile/chrome/content/notification.xml
+++ b/mobile/chrome/content/notification.xml
@@ -34,27 +34,14 @@
     </content>
 
     <implementation implements="nsIDOMEventListener">
-      <constructor>
-        <![CDATA[
-          this._chromeTab = Browser.selectedTab.chromeTab;
-          document.addEventListener("TabSelect", this, true);
-          document.addEventListener("TabClose", this, true);
-        ]]>
-      </constructor>
-
       // We need to override the close method here, otherwise the destructor
       // is not called on removeChild (see bug 230086)
       <method name="close">
         <body>
           <![CDATA[
             var control = this.control;
-            if (control) {
-              document.removeEventListener("TabClose", this, true);
-              document.removeEventListener("TabSelect", this, true);
+            if (control)
               control.removeNotification(this);
-            } else {
-              this.hidden = true;
-            }
             
             // Fire an event when closing a notification
             let event = document.createEvent("Events");
@@ -63,32 +50,10 @@
           ]]>
         </body>
       </method>
-
-      <method name="handleEvent">
-        <parameter name="aEvent"/>
-        <body>
-          <![CDATA[
-            switch(aEvent.type) {
-              case "TabSelect":
-                if (this._chromeTab == aEvent.target)
-                  this.hidden = false;
-                else
-                  this.hidden = true;
-                break;
-
-              case "TabClose":
-                if (this._chromeTab == aEvent.target)
-                  this.close();
-                break;
-            }
-          ]]>
-        </body>
-      </method>      
     </implementation>
   </binding>
 
   <binding id="geo-notification" extends="chrome://browser/content/notification.xml#notification">
-
     <resources>
       <stylesheet src="chrome://browser/skin/notification.css"/>
     </resources>