diff --git a/player/lua/osc.lua b/player/lua/osc.lua
index 06f73878ad..a750d850a6 100644
--- a/player/lua/osc.lua
+++ b/player/lua/osc.lua
@@ -439,7 +439,7 @@ end
 function window_controls_enabled()
     val = user_opts.windowcontrols
     if val == "auto" then
-        return not state.border
+        return not (state.border and state.title_bar)
     else
         return val ~= "no"
     end
@@ -2786,6 +2786,12 @@ mp.observe_property("border", "bool",
         request_init_resize()
     end
 )
+mp.observe_property("title-bar", "bool",
+    function(name, val)
+        state.title_bar = val
+        request_init_resize()
+    end
+)
 mp.observe_property("window-maximized", "bool",
     function(name, val)
         state.maximized = val