diff --git a/video/out/cocoa_cb_common.swift b/video/out/cocoa_cb_common.swift
index 9ba4ffd920..4be17c061c 100644
--- a/video/out/cocoa_cb_common.swift
+++ b/video/out/cocoa_cb_common.swift
@@ -81,6 +81,7 @@ class CocoaCB: NSObject {
 
     func uninit() {
         window?.orderOut(nil)
+        window?.close()
         mpv = nil
     }
 
@@ -129,6 +130,7 @@ class CocoaCB: NSObject {
         titleBar = TitleBar(frame: wr, window: window, cocoaCB: self)
 
         window.isRestorable = false
+        window.isReleasedWhenClosed = false
         window.makeMain()
         window.makeKeyAndOrderFront(nil)
         NSApp.activate(ignoringOtherApps: true)
@@ -153,7 +155,10 @@ class CocoaCB: NSObject {
         }
 
         let wr = getWindowGeometry(forScreen: targetScreen, videoOut: vo)
-        if !(window?.isVisible ?? false) {
+        if !(window?.isVisible ?? false) &&
+           !(window?.isMiniaturized ?? false) &&
+           !NSApp.isHidden
+        {
             window?.makeKeyAndOrderFront(nil)
         }
         layer?.atomicDrawingStart()