diff --git a/src/renderer/features/player/components/shuffle-all-modal.tsx b/src/renderer/features/player/components/shuffle-all-modal.tsx
index ae17c8507..eded98767 100644
--- a/src/renderer/features/player/components/shuffle-all-modal.tsx
+++ b/src/renderer/features/player/components/shuffle-all-modal.tsx
@@ -149,6 +149,8 @@ export const ShuffleAllContextModal = () => {
         if (playbackKind === 'albums') {
             const { data } = await refetchAlbums();
 
+            closeAllModals();
+
             addToQueueByFetch(
                 server.id,
                 data?.items.map((a) => a.id) ?? [],
@@ -158,10 +160,10 @@ export const ShuffleAllContextModal = () => {
         } else {
             const { data } = await refetchSongs();
 
+            closeAllModals();
+
             addToQueueByData(data?.items || [], playType);
         }
-
-        closeAllModals();
     };
 
     return (