diff --git a/src/ui/audio/AudioPlayer.cpp b/src/ui/audio/AudioPlayer.cpp
index 1cad4b2c..a1bd6f6e 100644
--- a/src/ui/audio/AudioPlayer.cpp
+++ b/src/ui/audio/AudioPlayer.cpp
@@ -182,16 +182,7 @@ AudioPlayer::AudioPlayer(ControlFlags controls, Wt::WContainerWidget *parent)
 		playQueueBtn->addStyleClass("mediaplayer-btn");
 		playQueueBtn->clicked().connect(std::bind([=] ()
 		{
-			if (playQueueBtn->hasStyleClass("mediaplayer-btn-active"))
-			{
-				playQueueBtn->removeStyleClass("mediaplayer-btn-active");
-				_playQueue.emit(false);
-			}
-			else
-			{
-				playQueueBtn->addStyleClass("mediaplayer-btn-active");
-				_playQueue.emit(true);
-			}
+			_playQueue.emit();
 		}));
 	}
 
diff --git a/src/ui/audio/AudioPlayer.hpp b/src/ui/audio/AudioPlayer.hpp
index 867824a9..669091e7 100644
--- a/src/ui/audio/AudioPlayer.hpp
+++ b/src/ui/audio/AudioPlayer.hpp
@@ -51,7 +51,7 @@ class AudioPlayer : public Wt::WTemplate
 		Wt::Signal<void>&	playPrevious()	{return _playPrevious;}
 		Wt::Signal<bool>&	shuffle()	{return _shuffle;}
 		Wt::Signal<bool>&	loop()		{return _loop;}
-		Wt::Signal<bool>&	showPlayQueue()	{return _playQueue;}
+		Wt::Signal<void>&	showPlayQueue()	{return _playQueue;}
 
 	private:
 
@@ -61,7 +61,7 @@ class AudioPlayer : public Wt::WTemplate
 		Wt::Signal<void>	_playPrevious;
 		Wt::Signal<bool>	_shuffle;
 		Wt::Signal<bool>	_loop;
-		Wt::Signal<bool>	_playQueue;
+		Wt::Signal<void>	_playQueue;
 
 		Wt::WAudio*	_audio;
 		Wt::WText*	_trackCurTime;
diff --git a/src/ui/audio/mobile/MobileAudio.cpp b/src/ui/audio/mobile/MobileAudio.cpp
index 0f8b036a..f1078acb 100644
--- a/src/ui/audio/mobile/MobileAudio.cpp
+++ b/src/ui/audio/mobile/MobileAudio.cpp
@@ -112,11 +112,10 @@ Audio::Audio(Wt::WContainerWidget *parent)
 	AudioPlayer* audioPlayer = new AudioPlayer(AudioPlayer::ControlPlayqueue);
 	footer->bindWidget("player", audioPlayer);
 
-	audioPlayer->showPlayQueue().connect(std::bind([=] (bool state)
+	audioPlayer->showPlayQueue().connect(std::bind([=]
 	{
-		if (state)
-			wApp->setInternalPath("/audio/playqueue", true);
-	}, std::placeholders::_1));
+		wApp->setInternalPath("/audio/playqueue", true);
+	}));
 
 	// Connect the audio player events to the playqueue
 	playQueue->playTrack().connect(std::bind([=] (Database::Track::id_type id)