diff --git a/app/components/Player/Fullscreen.vue b/app/components/Player/Fullscreen.vue
index 83bc7de..ea074f0 100644
--- a/app/components/Player/Fullscreen.vue
+++ b/app/components/Player/Fullscreen.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import LyricsDisplay from "./Fullscreen/LyricsDisplay.vue"
-
 const fullscreen = useFullscreen()
 const song = useSong()
 
@@ -24,6 +22,12 @@ onMounted(() => {
 		window.removeEventListener("mousemove", handleMouseMove)
 	})
 })
+
+const nuxtApp = useNuxtApp()
+
+nuxtApp.hook("page:finish", () => {
+	fullscreen.value = false
+})
 </script>
 
 <template>
@@ -54,7 +58,7 @@ onMounted(() => {
 				<PlayerFullscreenTrackDisplay
 					:show-buttons="mouseMovedRecently"
 				/>
-				<LyricsDisplay
+				<PlayerFullscreenLyricsDisplay
 					:animation-duration="0.2"
 					:offset="150"
 					:show-scroll-bar="mouseMovedRecently"
diff --git a/app/components/Player/Fullscreen/LyricsDisplay.vue b/app/components/Player/Fullscreen/LyricsDisplay.vue
index cf0ee76..ac9c134 100644
--- a/app/components/Player/Fullscreen/LyricsDisplay.vue
+++ b/app/components/Player/Fullscreen/LyricsDisplay.vue
@@ -132,7 +132,7 @@ const finalTransform = computed(() => {
 			<p
 				v-for="(lyric, i) in parsedLyrics"
 				:key="lyric.time"
-				:class="{ active: i == activeIndex }"
+				:class="{ active: i == scrollActiveIndex }"
 				ref="lyrics"
 				@click="() => (secondsPlayed = lyric.time)"
 			>