diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp
index 25e3cd86bcb..e60da666a8b 100644
--- a/mozilla/dom/src/base/nsGlobalWindow.cpp
+++ b/mozilla/dom/src/base/nsGlobalWindow.cpp
@@ -376,6 +376,11 @@ NS_IMETHODIMP GlobalWindowImpl::SetNewDocument(nsIDOMDocument* aDocument)
       doc = nsnull;             // Forces release now
     }
 
+    if (mListenerManager) {
+      mListenerManager->RemoveAllListeners(PR_FALSE);
+      mListenerManager = nsnull;
+    }
+
     if (docURL) {
       nsXPIDLCString url;
 
@@ -390,11 +395,6 @@ NS_IMETHODIMP GlobalWindowImpl::SetNewDocument(nsIDOMDocument* aDocument)
           mSidebar = nsnull;
         }
 
-        if (mListenerManager) {
-          mListenerManager->RemoveAllListeners(PR_FALSE);
-          mListenerManager = nsnull;
-        }
-
         if (mContext && mJSObject) {
 //      if (mContext && mJSObject && aDocument) {
 //      not doing this unless there's a new document prevents a closed window's