diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 83f9635fe..8cf8953c3 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -259,6 +259,12 @@ content.default_encoding:
     The encoding must be a string describing an encoding such as _utf-8_,
     _iso-8859-1_, etc.
 
+content.desktop_fullscreen:
+  type: Bool
+  default: true
+  desc: >-
+    Allow fullscreen to cover the entire desktop.
+
 content.developer_extras:
   type: Bool
   default: false
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 57e540a53..cfe549890 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -493,7 +493,8 @@ class MainWindow(QWidget):
     def _on_fullscreen_requested(self, on):
         if on:
             self.state_before_fullscreen = self.windowState()
-            self.showFullScreen()
+            if config.val.content.desktop_fullscreen:
+                self.showFullScreen()
         elif self.isFullScreen():
             self.setWindowState(self.state_before_fullscreen)
         log.misc.debug('on: {}, state before fullscreen: {}'.format(
diff --git a/qutebrowser/misc/miscwidgets.py b/qutebrowser/misc/miscwidgets.py
index 546cab8fb..1424ceac8 100644
--- a/qutebrowser/misc/miscwidgets.py
+++ b/qutebrowser/misc/miscwidgets.py
@@ -300,7 +300,10 @@ class FullscreenNotification(QLabel):
             self.setText("Page is now fullscreen.")
 
         self.resize(self.sizeHint())
-        geom = QApplication.desktop().screenGeometry(self)
+        if config.val.content.desktop_fullscreen:
+            geom = QApplication.desktop().screenGeometry(self)
+        else:
+            geom = self.parentWidget().geometry()
         self.move((geom.width() - self.sizeHint().width()) / 2, 30)
 
     def set_timeout(self, timeout):