diff --git a/xpfe/components/bookmarks/resources/bookmarks.js b/xpfe/components/bookmarks/resources/bookmarks.js
index d0e7e36d197..bdbed92d169 100644
--- a/xpfe/components/bookmarks/resources/bookmarks.js
+++ b/xpfe/components/bookmarks/resources/bookmarks.js
@@ -77,7 +77,8 @@ function Shutdown ()
   win.setAttribute("height", outerHeight);
   win.setAttribute("width", outerWidth);
 
-  gBookmarksShell.flushDataSource();
+  var bookmarksView = document.getElementById("bookmarks-view");
+  bookmarksView.flushBMDatasource();
 }
 
 function updateSendLinkItem()                                                   
diff --git a/xpfe/components/bookmarks/resources/bookmarks.xml b/xpfe/components/bookmarks/resources/bookmarks.xml
index 0b7dc0a4d0c..3d18b819932 100644
--- a/xpfe/components/bookmarks/resources/bookmarks.xml
+++ b/xpfe/components/bookmarks/resources/bookmarks.xml
@@ -95,6 +95,9 @@
         this._bundle = stringBundleService.createBundle(bundleURL, localeService.GetApplicationLocale());
         setTimeout(this.refreshSort, 0, this);
       ]]></constructor>
+      <destructor><![CDATA[
+        this.outlinerBuilder.removeObserver(this.builderObserver);
+      ]]></destructor>
 
       <property name="outlinerBoxObject">
         <getter><![CDATA[