From 19a27114fc460354c3d00d17b3c9ec0798caf400 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Sat, 12 Jan 2013 18:17:10 +0200
Subject: [PATCH] Bug 829913 - Error while closing web console; r=past

---
 browser/devtools/webconsole/HUDService.jsm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/browser/devtools/webconsole/HUDService.jsm b/browser/devtools/webconsole/HUDService.jsm
index d7821fe6539..65276f5b835 100644
--- a/browser/devtools/webconsole/HUDService.jsm
+++ b/browser/devtools/webconsole/HUDService.jsm
@@ -170,10 +170,19 @@ WebConsole.prototype = {
   iframe: null,
   _destroyer: null,
 
+  _browserWindow: null,
+
   get browserWindow()
   {
-    return this.target.isLocalTab ?
-           this.chromeWindow.top : HUDService.currentContext();
+    if (!this._browserWindow) {
+      let window = this.chromeWindow.top;
+      let element = window.document.documentElement;
+      if (element.getAttribute("windowtype") != "navigator:browser") {
+        window = HUDService.currentContext();
+      }
+      this._browserWindow = window;
+    }
+    return this._browserWindow;
   },
 
   /**