diff --git a/webmusic.js b/webmusic.js
index ab1cce6..4a6b356 100644
--- a/webmusic.js
+++ b/webmusic.js
@@ -161,7 +161,6 @@ const updateButtonState = () => {
 	}
 }
 
-
 const playSong = (id) => {
 	const element = document.getElementById(id);
 
@@ -172,16 +171,19 @@ const playSong = (id) => {
 		document.getElementsByClassName('playing')[0].classList.remove('playing');
 	}
 
-	playingItem = element.id;
+	if (document.getElementsByClassName('selected').length > 0) {
+		document.getElementsByClassName('selected')[0].classList.remove('selected');
+	}
 
 	audioPlayer.pause()
 
+	playingItem = element.id;
+	element.classList.add('playing');
+
 	audioPlayer.src = element.href;
 
 	setPlayerState('loading');
 	audioPlayer.load();
-	
-	element.classList.add('playing');
 }
 
 const togglePlayback = () => {