diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 317646ce3a..d61244b438 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -77,6 +77,8 @@ Interface changes
       print a warning in this particular case.
     - deprecate -del for list options (use -remove instead, which is by content
       instead of by integer index)
+    - if `--fs` is used but `--fs-screen` is not set, mpv will now use `--screen`
+      instead.
  --- mpv 0.30.0 ---
     - add `--d3d11-output-format` to enable explicit selection of a D3D11
       swap chain format.
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 7fe17aecb2..8ff149d86d 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2582,8 +2582,8 @@ Window
 ``--fs-screen=<all|current|0-32>``
     In multi-monitor configurations (i.e. a single desktop that spans across
     multiple displays), this option tells mpv which screen to go fullscreen to.
-    If ``default`` is provided mpv will fallback on using the behavior
-    depending on what the user provided with the ``screen`` option.
+    If ``current`` is used mpv will fallback on what the user provided with
+    the ``screen`` option.
 
     .. admonition:: Note (X11)
 
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 8d03c43af3..d6ecf4969c 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -473,6 +473,9 @@ static void vo_x11_update_screeninfo(struct vo *vo)
         XineramaScreenInfo *screens;
         int num_screens;
 
+        if (opts->fullscreen && opts->fsscreen_id == -1)
+            screen = opts->screen_id;
+
         screens = XineramaQueryScreens(x11->display, &num_screens);
         if (screen >= num_screens)
             screen = num_screens - 1;