diff --git a/src/components/player/NowPlayingMiniView.tsx b/src/components/player/NowPlayingMiniView.tsx
index 657beac..1ecb8df 100644
--- a/src/components/player/NowPlayingMiniView.tsx
+++ b/src/components/player/NowPlayingMiniView.tsx
@@ -70,7 +70,11 @@ const NowPlayingMiniView = () => {
           dispatch(toggleSelected(rowData));
         } else if (e.shiftKey) {
           dispatch(setRangeSelected(rowData));
-          dispatch(toggleRangeSelected(playQueue.entry));
+          dispatch(
+            toggleRangeSelected(
+              playQueue.shuffle ? playQueue.shuffledEntry : playQueue.entry
+            )
+          );
         } else {
           dispatch(setSelected(rowData));
         }
diff --git a/src/components/player/NowPlayingView.tsx b/src/components/player/NowPlayingView.tsx
index 83f54ae..9afa588 100644
--- a/src/components/player/NowPlayingView.tsx
+++ b/src/components/player/NowPlayingView.tsx
@@ -71,7 +71,11 @@ const NowPlayingView = () => {
           if (searchQuery !== '') {
             dispatch(toggleRangeSelected(filteredData));
           } else {
-            dispatch(toggleRangeSelected(playQueue.entry));
+            dispatch(
+              toggleRangeSelected(
+                playQueue.shuffle ? playQueue.shuffledEntry : playQueue.entry
+              )
+            );
           }
         } else {
           dispatch(setSelected(rowData));