2 files changed, 4 insertions, 0 deletions
diff --git a/video/out/mac/view.swift b/video/out/mac/view.swift
index 3c0f34722f..047a5238e4 100644
--- a/video/out/mac/view.swift
+++ b/video/out/mac/view.swift
@@ -165,6 +165,7 @@ class View: NSView, CALayerDelegate {
     }
 
     override func magnify(with event: NSEvent) {
+        common.window?.isAnimating = event.phase != .ended
         event.phase == .ended ? common.windowDidEndLiveResize() : common.windowWillStartLiveResize()
         common.window?.addWindowScale(Double(event.magnification))
     }
diff --git a/video/out/mac/window.swift b/video/out/mac/window.swift
index 3c02bd90ca..fb82e3c274 100644
--- a/video/out/mac/window.swift
+++ b/video/out/mac/window.swift
@@ -550,6 +550,9 @@ class Window: NSWindow, NSWindowDelegate {
     }
 
     func windowDidResize(_ notification: Notification) {
+        if let contentViewFrame = contentView?.frame, !isAnimating && !isInFullscreen && !inLiveResize {
+            unfsContentFrame = convertToScreen(contentViewFrame)
+        }
         common.windowDidResize()
     }