diff --git a/src/song_save.c b/src/song_save.c
index 5fe3522e9..0a6e000e4 100644
--- a/src/song_save.c
+++ b/src/song_save.c
@@ -91,8 +91,10 @@ static int matchesAnMpdTagItemKey(char *buffer, int *itemType)
 	int i;
 
 	for (i = 0; i < TAG_NUM_OF_ITEM_TYPES; i++) {
-		if (0 == strncmp(mpdTagItemKeys[i], buffer,
-				 strlen(mpdTagItemKeys[i]))) {
+		size_t len = strlen(mpdTagItemKeys[i]);
+
+		if (0 == strncmp(mpdTagItemKeys[i], buffer, len) &&
+		    buffer[len] == ':' && buffer[len + 1] == ' ') {
 			*itemType = i;
 			return 1;
 		}