diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst
index f99c86ab4d..f9d3282098 100644
--- a/DOCS/man/osc.rst
+++ b/DOCS/man/osc.rst
@@ -331,7 +331,9 @@ Configurable Options
     default values.)
 
     Currently, this is supported for the ``bottombar`` and ``topbar`` layout
-    only. The other layouts do not change if this option is set.
+    only. The other layouts do not change if this option is set. Separately,
+    if window controls are present (see below), they will be affected
+    regardless of which osc layout is in use.
 
     The border is static and appears even if the OSC is configured to appear
     only on mouse interaction. If the OSC is invisible, the border is simply
diff --git a/player/lua/osc.lua b/player/lua/osc.lua
index ee18d0f89f..848fd25d34 100644
--- a/player/lua/osc.lua
+++ b/player/lua/osc.lua
@@ -1054,6 +1054,9 @@ function window_controls(alignment, topbar)
     if topbar then
         -- The title is already there as part of the top bar
         return
+    else
+        -- Apply boxvideo margins to the control bar
+        osc_param.video_margins.t = wsc_geo.h / osc_param.playresy
     end
 
     -- Window Title