diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 07a23092e..5dfaa0086 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -107,6 +107,8 @@ Changed
 - Lots of improvements to and bugfixes for the QtWebEngine backend, such as
   working hints. However, using qutebrowser directly from git is still advised
   when using `--backend webengine`.
+- `content -> javascript-can-open-windows` got renamed to
+  `javascript-can-open-windows-automatically`.
 
 Deprecated
 ~~~~~~~~~~
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index f3a6e29f5..6f4d58868 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -157,7 +157,7 @@
 |<<content-hyperlink-auditing,hyperlink-auditing>>|Enable or disable hyperlink auditing (<a ping>).
 |<<content-geolocation,geolocation>>|Allow websites to request geolocations.
 |<<content-notifications,notifications>>|Allow websites to show notifications.
-|<<content-javascript-can-open-windows,javascript-can-open-windows>>|Whether JavaScript programs can open new windows.
+|<<content-javascript-can-open-windows-automatically,javascript-can-open-windows-automatically>>|Whether JavaScript programs can open new windows without user interaction.
 |<<content-javascript-can-close-windows,javascript-can-close-windows>>|Whether JavaScript programs can close windows.
 |<<content-javascript-can-access-clipboard,javascript-can-access-clipboard>>|Whether JavaScript programs can read or write to the clipboard.
 |<<content-ignore-javascript-prompt,ignore-javascript-prompt>>|Whether all javascript prompts should be ignored.
@@ -1427,9 +1427,9 @@ Valid values:
 
 Default: +pass:[ask]+
 
-[[content-javascript-can-open-windows]]
-=== javascript-can-open-windows
-Whether JavaScript programs can open new windows.
+[[content-javascript-can-open-windows-automatically]]
+=== javascript-can-open-windows-automatically
+Whether JavaScript programs can open new windows without user interaction.
 
 Valid values:
 
diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index 5c93bae49..a8ca17149 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -112,7 +112,7 @@ MAPPINGS = {
             Attribute(QWebEngineSettings.AutoLoadImages),
         'allow-javascript':
             Attribute(QWebEngineSettings.JavascriptEnabled),
-        'javascript-can-open-windows':
+        'javascript-can-open-windows-automatically':
             Attribute(QWebEngineSettings.JavascriptCanOpenWindows),
         'javascript-can-access-clipboard':
             Attribute(QWebEngineSettings.JavascriptCanAccessClipboard),
diff --git a/qutebrowser/browser/webkit/webkitsettings.py b/qutebrowser/browser/webkit/webkitsettings.py
index d5af1dfd9..911a9709b 100644
--- a/qutebrowser/browser/webkit/webkitsettings.py
+++ b/qutebrowser/browser/webkit/webkitsettings.py
@@ -118,7 +118,7 @@ MAPPINGS = {
             Attribute(QWebSettings.AutoLoadImages),
         'allow-javascript':
             Attribute(QWebSettings.JavascriptEnabled),
-        'javascript-can-open-windows':
+        'javascript-can-open-windows-automatically':
             Attribute(QWebSettings.JavascriptCanOpenWindows),
         'javascript-can-close-windows':
             Attribute(QWebSettings.JavascriptCanCloseWindows),
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 636e3a4d0..e6aa3db7c 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -385,6 +385,8 @@ class ConfigManager(QObject):
         ('completion', 'history-length'): 'cmd-history-max-items',
         ('colors', 'downloads.fg'): 'downloads.fg.start',
         ('ui', 'show-keyhints'): 'keyhint-blacklist',
+        ('content', 'javascript-can-open-windows'):
+            'javascript-can-open-windows-automatically',
     }
     DELETED_OPTIONS = [
         ('colors', 'tab.separator'),
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index 89aee870f..533b354f8 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -808,9 +808,10 @@ def data(readonly=False):
              SettingValue(typ.BoolAsk(), 'ask'),
              "Allow websites to show notifications."),
 
-            ('javascript-can-open-windows',
+            ('javascript-can-open-windows-automatically',
              SettingValue(typ.Bool(), 'false'),
-             "Whether JavaScript programs can open new windows."),
+             "Whether JavaScript programs can open new windows without user "
+             "interaction."),
 
             ('javascript-can-close-windows',
              SettingValue(typ.Bool(), 'false',