diff --git a/Sources/Brave/Frontend/Browser/Playlist/Controllers/PlaylistListViewController.swift b/Sources/Brave/Frontend/Browser/Playlist/Controllers/PlaylistListViewController.swift
index 04c0501270d..998a3dc8684 100644
--- a/Sources/Brave/Frontend/Browser/Playlist/Controllers/PlaylistListViewController.swift
+++ b/Sources/Brave/Frontend/Browser/Playlist/Controllers/PlaylistListViewController.swift
@@ -704,7 +704,7 @@ extension PlaylistListViewController {
           }
         }
         
-        let items = try await PlaylistSharedFolderNetwork.fetchMediaItemInfo(item: model, viewForInvisibleWebView: self.view)
+        let items = try await PlaylistSharedFolderNetwork.fetchMediaItemInfo(item: model, viewForInvisibleWebView: self.playerView.window ?? self.playerView.superview ?? self.playerView)
         try Task.checkCancellation()
         
         try folder.playlistItems?.forEach({ playlistItem in
diff --git a/Sources/Brave/Frontend/Browser/Playlist/Managers & Cache/PlaylistCacheLoader.swift b/Sources/Brave/Frontend/Browser/Playlist/Managers & Cache/PlaylistCacheLoader.swift
index 929a472cfe1..9198c18e382 100644
--- a/Sources/Brave/Frontend/Browser/Playlist/Managers & Cache/PlaylistCacheLoader.swift	
+++ b/Sources/Brave/Frontend/Browser/Playlist/Managers & Cache/PlaylistCacheLoader.swift	
@@ -340,7 +340,7 @@ class PlaylistWebLoader: UIView {
       
       guard let webView = tab.webView,
             let browserViewController = self.currentScene?.browserViewController else {
-        continuation.resume(returning: nil)
+        self.handler?(nil)
         return
       }