diff --git a/Model/OpenVideosModel.swift b/Model/OpenVideosModel.swift
index 03a21752..a28d4135 100644
--- a/Model/OpenVideosModel.swift
+++ b/Model/OpenVideosModel.swift
@@ -97,7 +97,15 @@ struct OpenVideosModel {
 
         if playbackMode == .playNow || playbackMode == .shuffleAll {
             player.show()
-            player.advanceToNextItem()
+            #if os(iOS)
+                if player.presentingPlayer {
+                    player.advanceToNextItem()
+                } else {
+                    player.onPresentPlayer.append { [weak player] in player?.advanceToNextItem() }
+                }
+            #else
+                player.advanceToNextItem()
+            #endif
         }
     }