--- a/xpfe/appshell/nsAppShellService.cpp
+++ b/xpfe/appshell/nsAppShellService.cpp
@@ -126,43 +126,39 @@ nsAppShellService::CreateHiddenWindowHel
   static const char hiddenWindowURL[] = DEFAULT_HIDDENWINDOW_URL;
   uint32_t    chromeMask =  nsIWebBrowserChrome::CHROME_ALL;
 #endif
 
   nsCOMPtr<nsIURI> url;
   rv = NS_NewURI(getter_AddRefs(url), hiddenWindowURL);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  RefPtr<nsWebShellWindow> newWindow;
-  if (!aIsPrivate) {
-    rv = JustCreateTopWindow(nullptr, url,
-                             chromeMask, initialWidth, initialHeight,
-                             true, nullptr, nullptr, getter_AddRefs(newWindow));
-    NS_ENSURE_SUCCESS(rv, rv);
+  if (aIsPrivate) {
+    chromeMask |= nsIWebBrowserChrome::CHROME_PRIVATE_WINDOW;
+  }
 
-    mHiddenWindow.swap(newWindow);
-  } else {
-    // Create the hidden private window
-    chromeMask |= nsIWebBrowserChrome::CHROME_PRIVATE_WINDOW;
+  RefPtr<nsWebShellWindow> newWindow;
+  rv = JustCreateTopWindow(nullptr, url,
+                           chromeMask, initialWidth, initialHeight,
+                           true, nullptr, nullptr, getter_AddRefs(newWindow));
+  NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = JustCreateTopWindow(nullptr, url,
-                             chromeMask, initialWidth, initialHeight,
-                             true, nullptr, nullptr, getter_AddRefs(newWindow));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<nsIDocShell> docShell;
-    newWindow->GetDocShell(getter_AddRefs(docShell));
-    if (docShell) {
+  nsCOMPtr<nsIDocShell> docShell;
+  newWindow->GetDocShell(getter_AddRefs(docShell));
+  if (docShell) {
+    if (aIsPrivate) {
       docShell->SetAffectPrivateSessionLifetime(false);
     }
-
-    mHiddenPrivateWindow.swap(newWindow);
   }
 
-  // RegisterTopLevelWindow(newWindow); -- Mac only
+  if (aIsPrivate) {
+    mHiddenPrivateWindow.swap(newWindow);
+  } else {
+    mHiddenWindow.swap(newWindow);
+  }
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsAppShellService::DestroyHiddenWindow()
 {
   if (mHiddenWindow) {