2 files changed, 7 insertions, 3 deletions
diff --git a/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp b/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp
index a31414e7f..437d21997 100644
--- a/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp
+++ b/embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp
@@ -2351,18 +2351,16 @@ nsWebBrowserPersist::EndDownload(nsresult aResult)
     {
         mPersistResult = aResult;
     }
+
     // mCompleted needs to be set before issuing the stop notification.
     // (Bug 1224437)
     mCompleted = true;
-
-#ifdef MOZ_JSDOWNLOADS
     // State stop notification
     if (mProgressListener) {
         mProgressListener->OnStateChange(nullptr, nullptr,
             nsIWebProgressListener::STATE_STOP
             | nsIWebProgressListener::STATE_IS_NETWORK, mPersistResult);
     }
-#endif
 
     // Do file cleanup if required
     if (NS_FAILED(aResult) && (mPersistFlags & PERSIST_FLAGS_CLEANUP_ON_FAILURE))
diff --git a/embedding/components/windowwatcher/nsWindowWatcher.cpp b/embedding/components/windowwatcher/nsWindowWatcher.cpp
index 3732ea66d..fa23e285b 100644
--- a/embedding/components/windowwatcher/nsWindowWatcher.cpp
+++ b/embedding/components/windowwatcher/nsWindowWatcher.cpp
@@ -1297,6 +1297,12 @@ nsWindowWatcher::OpenWindowInternal(mozIDOMWindowProxy* aParent,
     }
   }
 
+  // If a website opens a popup exit DOM fullscreen
+  if (windowIsNew && aCalledFromJS && !hasChromeParent && !isCallerChrome &&
+      parentWindow) {
+    nsIDocument::AsyncExitFullscreen(parentWindow->GetDoc());
+  }
+			
   if (aForceNoOpener && windowIsNew) {
     NS_RELEASE(*aResult);
   }