diff --git a/PlaylistList.cpp b/PlaylistList.cpp
index a7fe817..87a575f 100644
--- a/PlaylistList.cpp
+++ b/PlaylistList.cpp
@@ -215,13 +215,14 @@ PlaylistList::mediainfoChanged (uint id, const Xmms::PropDict &info)
 	PlaylistItem *i = m_itemmap->value (id);
 	if (i) {
 		QString n;
-		if (info.contains ("artist") && info.contains ("album") &&
-		    info.contains ("title")) {
-			n = QString::fromUtf8 (info.get<std::string> ("artist").c_str ())
-			    + " - " +
-			    QString::fromUtf8 (info.get<std::string> ("album").c_str ())
-			    + " - " +
-			    QString::fromUtf8 (info.get<std::string> ("title").c_str ());
+		if (info.contains ("title")) {
+			if (info.contains ("artist")) {
+				n = QString::fromUtf8 (info.get<std::string> ("artist").c_str ()) + " - ";
+			}
+			if (info.contains ("album")) {
+				n += QString::fromUtf8 (info.get<std::string> ("album").c_str ()) + " - ";
+			}
+			n += QString::fromUtf8 (info.get<std::string> ("title").c_str ());
 		} else if (info.contains ("channel")) {
 			n = QString::fromUtf8 (info.get<std::string> ("channel").c_str ())
 			    + " - " +