diff --git a/mopidy/mpd/dispatcher.py b/mopidy/mpd/dispatcher.py
index 3ca255bf..b28140f2 100644
--- a/mopidy/mpd/dispatcher.py
+++ b/mopidy/mpd/dispatcher.py
@@ -293,7 +293,7 @@ class MpdContext(object):
 
         for part in path_parts:
             for ref in self.core.library.browse(uri).get():
-                if (ref.type in (ref.DIRECTORY, ref.PLAYLIST) and
+                if (ref.type in (ref.DIRECTORY, ref.ALBUM, ref.PLAYLIST) and
                         ref.name == part):
                     uri = ref.uri
                     break
@@ -308,7 +308,7 @@ class MpdContext(object):
             base_path, future = path_and_futures.pop()
             for ref in future.get():
                 path = '/'.join([base_path, ref.name.replace('/', '')])
-                if ref.type in (ref.DIRECTORY, ref.PLAYLIST):
+                if ref.type in (ref.DIRECTORY, ref.ALBUM, ref.PLAYLIST):
                     yield (path, None)
                     if recursive:
                         path_and_futures.append(