diff --git a/apps/tagnavi.config b/apps/tagnavi.config
index 254fe04092..b9d50c5c9b 100644
--- a/apps/tagnavi.config
+++ b/apps/tagnavi.config
@@ -131,6 +131,7 @@
 # Define the search sub menu
 %menu_start "search" "Search by..."
 "Artist" -> canonicalartist ? canonicalartist ~ "" -> album -> title = "fmt_title"
+"Album Artist" -> albumartist ? albumartist ~ "" -> album -> title = "fmt_title"
 "Album" -> album ? album ~ "" -> title = "fmt_title"
 "Title" -> title = "fmt_title" ? title ~ ""
 "Album by year" -> album ? year = "" -> title = "fmt_title"
@@ -167,6 +168,7 @@
 # Define the title of the main menu
 %menu_start "main" "Database"
 "Artist"   -> canonicalartist   -> album  -> title = "fmt_title"
+"Album Artist" -> albumartist   -> album  -> title = "fmt_title"
 "Album"    -> album    -> title = "fmt_title"
 "Genre"    -> genre    -> canonicalartist -> album -> title = "fmt_title"
 "Composer" -> composer -> album -> title = "fmt_title"