diff --git a/src/playlist.cpp b/src/playlist.cpp
index 9754b83f..f191fbb9 100644
--- a/src/playlist.cpp
+++ b/src/playlist.cpp
@@ -137,11 +137,14 @@ void Playlist::MouseButtonPressed(MEVENT me)
 {
 	if (w->Empty() || !w->hasCoords(me.x, me.y) || size_t(me.y) >= w->Size())
 		return;
-	if (me.bstate & BUTTON1_PRESSED)
+	if (me.bstate & BUTTON1_PRESSED || me.bstate & BUTTON3_PRESSED)
 	{
 		w->Goto(me.y);
-		Mpd->Play(w->Current().GetPosition());
-		UpdateStatusImmediately = 1;
+		if (me.bstate & BUTTON3_PRESSED)
+		{
+			Mpd->Play(w->Current().GetPosition());
+			UpdateStatusImmediately = 1;
+		}
 	}
 	else
 		Screen< Menu<MPD::Song> >::MouseButtonPressed(me);