diff --git a/src/components/Player.vue b/src/components/Player.vue
index 777233d..9684c3a 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -161,6 +161,8 @@ watch(() => playQueueStore.playMode.shuffle, (isShuffle) => {
 		if (!playQueueStore.shuffleCurrent) {
 			shuffledList.push(currentIndex)
 		}
+		// 重置 shuffleCurrent 标签
+		playQueueStore.shuffleCurrent = undefined
 
 		// 将剩余的项目列出来
 		let shuffleSpace = [...Array(trackCount).keys()]
diff --git a/src/pages/AlbumDetail.vue b/src/pages/AlbumDetail.vue
index 53c0fea..e66de8f 100644
--- a/src/pages/AlbumDetail.vue
+++ b/src/pages/AlbumDetail.vue
@@ -78,7 +78,12 @@ function playTheAlbum(from: number = 0) {
 					</button>
 
 					<button
-						class="text-white w-10 h-10 bg-white/5 border border-[#ffffff39] rounded-full flex justify-center items-center">
+						class="text-white w-10 h-10 bg-white/5 border border-[#ffffff39] rounded-full flex justify-center items-center"
+						@click="() => {
+							playTheAlbum()
+							playQueue.shuffleCurrent = true
+							playQueue.playMode.shuffle = true
+						}">
 						<ShuffleIcon :size="4" />
 					</button>