diff --git a/NEWS b/NEWS
index caca51d0..f4a8ded4 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ ncmpcpp-0.6.5 (????-??-??)
 * When numbering tracks in tag editor all the other track tags are discarded.
 * Xiph tag DESCRIPTION is now rewritten as COMMENT when updating tags.
 * Possible access of already freed memory when downloading artist info is fixed.
+* Name of an item is now displayed correctly if present.
 
 ncmpcpp-0.6.4 (2015-05-02)
 
diff --git a/src/song.cpp b/src/song.cpp
index c7d07ba7..3498e37f 100644
--- a/src/song.cpp
+++ b/src/song.cpp
@@ -74,7 +74,9 @@ std::string Song::getName(unsigned idx) const
 	assert(m_song);
 	mpd_song *s = m_song.get();
 	const char *res = mpd_song_get_tag(s, MPD_TAG_NAME, idx);
-	if (!res && idx > 0)
+	if (res)
+		return res;
+	else if (idx > 0)
 		return "";
 	const char *uri = mpd_song_get_uri(s);
 	const char *name = strrchr(uri, '/');