diff --git a/mopidy/frontends/mpd/translator.py b/mopidy/frontends/mpd/translator.py
index d4686597..266d0d88 100644
--- a/mopidy/frontends/mpd/translator.py
+++ b/mopidy/frontends/mpd/translator.py
@@ -183,10 +183,12 @@ def query_from_mpd_list_format(field, mpd_query):
 # and in mopidy.frontends.mpd.protocol.music_db.QUERY_RE.
 
 MPD_SEARCH_QUERY_RE = re.compile(r"""
+    \b                  # Only begin matching at word bundaries
     "?                  # Optional quote around the field type
     (?:                 # A non-capturing group for the field type
         [Aa]lbum
       | [Aa]rtist
+      | [Aa]lbumartist
       | [Dd]ate
       | [Ff]ile
       | [Ff]ilename
@@ -199,10 +201,12 @@ MPD_SEARCH_QUERY_RE = re.compile(r"""
 """, re.VERBOSE)
 
 MPD_SEARCH_QUERY_PART_RE = re.compile(r"""
+    \b                  # Only begin matching at word bundaries
     "?                  # Optional quote around the field type
     (?P<field>(         # A capturing group for the field type
         [Aa]lbum
       | [Aa]rtist
+      | [Aa]lbumartist
       | [Dd]ate
       | [Ff]ile
       | [Ff]ilename