diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index a0c8c5076cb8..a789609b634c 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -929,7 +929,7 @@ function BrowserCloseWindow()
   win.setAttribute( "height", h );
   win.setAttribute( "width", w );
 
-  window.close();
+  closeWindow(true);
 }
 
 function loadURI(uri, referrer)
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 8893c57ab95b..682997291521 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -40,7 +40,7 @@
 <window id="main-window"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="Startup()" onunload="Shutdown()"
+        onload="Startup()" onunload="Shutdown()" onclose="return closeWindow(false);"
         contenttitlesetting="true"
         title="&mainWindow.title;"
         titlemodifier="&mainWindow.title;"
diff --git a/browser/base/content/pageInfo.xul b/browser/base/content/pageInfo.xul
index e2679e6d748a..54ae905dd2e9 100644
--- a/browser/base/content/pageInfo.xul
+++ b/browser/base/content/pageInfo.xul
@@ -33,17 +33,18 @@
 <window id="main-window"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   windowtype="Browser:page-info"
-  onload="onLoadPageInfo()"
+  onload="onLoadPageInfo()" onclose="return closeWindow(false);"
   align="stretch" class="dialog"
   screenX="10" screenY="10"
   width="&pageInfoWindow.width;" height="&pageInfoWindow.height;"
   persist="screenX screenY width height sizemode">
 
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/contentAreaUtils.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/pageInfo.js"/>
 
   <keyset>
-    <key id="closeWindow" key="&closeWindow;" modifiers="accel" oncommand="window.close();"/>
+    <key id="closeWindow" key="&closeWindow;" modifiers="accel" oncommand="closeWindow(true);"/>
     <key keycode="VK_ESCAPE" oncommand="window.close();"/>
     <key id="copy" key="c" modifiers="accel" oncommand="doCopy(event);"/>
   </keyset>
diff --git a/browser/components/bookmarks/content/bookmarksManager.xul b/browser/components/bookmarks/content/bookmarksManager.xul
index c84537cb7ec3..b1502e357389 100644
--- a/browser/components/bookmarks/content/bookmarksManager.xul
+++ b/browser/components/bookmarks/content/bookmarksManager.xul
@@ -36,7 +36,8 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         width="630" height="400" screenX="20" screenY="20"
         persist="width height screenX screenY sizemode"
-        onload="Startup();" onunload="Shutdown();">
+        onload="Startup();" onunload="Shutdown();"
+        onclose="return closeWindow(false);">
 
   <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
@@ -51,7 +52,7 @@
               oncommandupdate="document.getElementById('bookmarks-view').onCommandUpdate();">
   </commandset>
 
-  <command id="cmd_close" oncommand="window.close()"/>
+  <command id="cmd_close" oncommand="closeWindow(true);"/>
   <command id="cmd_bm_open"                      oncommand="goDoCommand('cmd_bm_open');"/>
   <command id="cmd_bm_openinnewwindow"           oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
   <command id="cmd_bm_openinnewtab"              oncommand="goDoCommand('cmd_bm_openinnewtab');"/>