diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index bf35b74a83d..60482fde842 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -4743,10 +4743,12 @@ nsDocShell::InternalLoad(nsIURI * aURI,
         //
         if (mDisallowPopupWindows) {
             PRBool bIsChromeOrResource = PR_FALSE;
-
-            aURI->SchemeIs("chrome", &bIsChromeOrResource);
+            mCurrentURI->SchemeIs("chrome", &bIsChromeOrResource);
             if (!bIsChromeOrResource) {
-                aURI->SchemeIs("resource", &bIsChromeOrResource);
+                aURI->SchemeIs("chrome", &bIsChromeOrResource);
+                if (!bIsChromeOrResource) {
+                    aURI->SchemeIs("resource", &bIsChromeOrResource);
+                }
             }
             if (!bIsChromeOrResource) {
                 if (name.EqualsIgnoreCase("_blank") ||