diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m
index f386d78edb0aa324c7caaaef6d660581bed96cc5..3e74c26e97a43dd7dd3723711682917f38019235 100644
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -168,6 +168,9 @@
 
     [[o_window videoView] releaseVoutThread];
     [o_vout_dict removeObjectForKey:o_key];
+
+    if ([o_vout_dict count] == 0)
+        [[VLCMain sharedInstance] setActiveVideoPlayback:NO];
 }
 
 - (void)updateWindowsControlsBarWithSelector:(SEL)aSel
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 213896845c9dbd0b21bc70c40d7acf080a57eca2..0da7f13c81a30ff1a4ed71c4b2746453b3185915 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -240,7 +240,6 @@ static int WindowControl(vout_window_t *p_wnd, int i_query, va_list args)
 void WindowClose(vout_window_t *p_wnd)
 {
     NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
-    [[VLCMain sharedInstance] setActiveVideoPlayback:NO];
 
     [[[VLCMain sharedInstance] voutController] performSelectorOnMainThread:@selector(removeVoutforDisplay:) withObject:[NSValue valueWithPointer:p_wnd] waitUntilDone:NO];