diff --git a/extensions/cookie/nsCookiePromptService.cpp b/extensions/cookie/nsCookiePromptService.cpp
index 32c875d56b7..f50c077ce8f 100644
--- a/extensions/cookie/nsCookiePromptService.cpp
+++ b/extensions/cookie/nsCookiePromptService.cpp
@@ -13,6 +13,7 @@
 #include "nsString.h"
 #include "nsIDialogParamBlock.h"
 #include "nsIMutableArray.h"
+#include "mozilla/dom/ScriptSettings.h"
 
 /****************************************************************
  ************************ nsCookiePromptService *****************
@@ -71,6 +72,11 @@ nsCookiePromptService::CookieDialog(nsIDOMWindow *aParent,
     parent = do_QueryInterface(privateParent);
   }
 
+  // We're opening a chrome window and passing in a nsIDialogParamBlock. Setting
+  // the nsIDialogParamBlock as the .arguments property on the chrome window
+  // requires system principals on the stack, so we use an AutoNoJSAPI for that.
+  mozilla::dom::AutoNoJSAPI nojsapi;
+
   // The cookie dialog will be modal for the root chrome window rather than the
   // tab containing the permission-requesting page.  This removes confusion
   // about which monitor is displaying the dialog (see bug 470356), but also
diff --git a/extensions/cookie/test/mochitest.ini b/extensions/cookie/test/mochitest.ini
index 794dce7d52e..0d5c8ec3832 100644
--- a/extensions/cookie/test/mochitest.ini
+++ b/extensions/cookie/test/mochitest.ini
@@ -38,3 +38,4 @@ support-files =
 [test_same_base_domain_5.html]
 [test_same_base_domain_6.html]
 [test_samedomain.html]
+[test_bug1041808.html]
diff --git a/extensions/cookie/test/test_bug1041808.html b/extensions/cookie/test/test_bug1041808.html
new file mode 100644
index 00000000000..38a8832e0e9
--- /dev/null
+++ b/extensions/cookie/test/test_bug1041808.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1041808
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1041808</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript">
+
+  /** Test for Bug 1041808 **/
+
+SimpleTest.waitForExplicitFinish();
+
+var dialogsOpened = 0;
+var dialogsClosed = 0;
+function dismissDialog(aSubject, aTopic, aData)
+{
+  if (aTopic == "domwindowopened") {
+    var win = SpecialPowers.wrap(aSubject);
+    win.addEventListener("pageshow", function() {
+      win.removeEventListener("pageshow", arguments.callee, false);
+      sendKey("RETURN", aSubject);
+    }, false);
+    ++dialogsOpened;
+  } else if (aTopic == "domwindowclosed") {
+    ++dialogsClosed;
+  }
+}
+
+function runTest()
+{
+  SpecialPowers.Services.ww.registerNotification(dismissDialog);
+  document.cookie = "test1=testValue";
+  document.cookie = "test2=testValue";
+  document.cookie = "test3=testValue";
+  SpecialPowers.Services.ww.unregisterNotification(dismissDialog);
+  is(dialogsOpened, 3, "Setting a cookie should have asked for permission");
+  is(dialogsOpened - dialogsClosed, 0,
+     "Setting a cookie shouldn't have left any additional windows open");
+  SimpleTest.finish();
+}
+
+SpecialPowers.pushPrefEnv({"set": [["network.cookie.lifetimePolicy", 1]]},
+                          runTest);
+
+  </script>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1041808">Mozilla Bug 1041808</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>
