diff --git a/homeassistant/components/media_player/mpd.py b/homeassistant/components/media_player/mpd.py
index b6c89cbfc3fd6d707a4c716cf2217f5fb3a705db..e1cdadd9ae2bb221f6964fcf2e2e3a0fb32a45cc 100644
--- a/homeassistant/components/media_player/mpd.py
+++ b/homeassistant/components/media_player/mpd.py
@@ -141,7 +141,15 @@ class MpdDevice(MediaPlayerDevice):
     @property
     def media_title(self):
         """ Title of current playing media. """
-        return self.currentsong['title']
+        name = self.currentsong['name']
+        title = self.currentsong['title']
+
+        if name:
+            separator = ': '
+            nameandtitle = (name, title)
+            return separator.join(nameandtitle)
+        else:
+            return title
 
     @property
     def media_artist(self):