diff --git a/mixins/SoundTrack.pixy b/mixins/SoundTrack.pixy
index 3e58399f..4e0c7dbe 100644
--- a/mixins/SoundTrack.pixy
+++ b/mixins/SoundTrack.pixy
@@ -23,7 +23,6 @@ component SoundTrackContent(track *arn.SoundTrack, media *arn.ExternalMedia)
 						.visualizer-box.visualizer-box-1
 						.visualizer-box.visualizer-box-2
 						.visualizer-box.visualizer-box-3
-
 		else
 			ExternalMedia(media)
 
diff --git a/scripts/Actions/Audio.ts b/scripts/Actions/Audio.ts
index 68a186df..990584bc 100644
--- a/scripts/Actions/Audio.ts
+++ b/scripts/Actions/Audio.ts
@@ -76,10 +76,12 @@ export function stopAudio(arn: AnimeNotifier) {
 
 // Toggle audio
 export function toggleAudio(arn: AnimeNotifier, element: HTMLElement) {
-	if(!arn.currentSoundTrackId) {
-		playAudio(arn, element)
-	} else {
+	// If we're clicking on the same track again, stop playing.
+	// Otherwise, start the track we clicked on.
+	if(arn.currentSoundTrackId && element.dataset.soundtrackId === arn.currentSoundTrackId) {
 		stopAudio(arn)
+	} else {
+		playAudio(arn, element)
 	}
 }