1 files changed, 8 insertions, 7 deletions

diff --git a/apps/tagnavi.config b/apps/tagnavi.config
index 6eda05ec44..6baa6e1328 100644
--- a/apps/tagnavi.config
+++ b/apps/tagnavi.config
@@ -176,20 +176,21 @@
 
 # Define the title of the main menu
 %menu_start "main" "Database"
-"Artist"   -> canonicalartist   -> album  -> title = "fmt_title"
 "Album Artist" -> albumartist   -> album  -> title = "fmt_title"
+"Artist"   -> canonicalartist   -> album  -> title = "fmt_title"
 "Album"    -> album    -> title = "fmt_title"
 "Genre"    -> genre    -> canonicalartist -> album -> title = "fmt_title"
+"Year"     -> year ? year > "0" -> canonicalartist -> album -> title = "fmt_title"
 "Composer" -> composer -> album -> title = "fmt_title"
+"A to Z" ==> "a2z"
 "Track"   ==> "track"
-"Year"     -> year ? year > "0" -> canonicalartist -> album -> title = "fmt_title"
+"Shuffle Songs" ~> title = "fmt_title"
+"Search" ==> "search"
 "User Rating" -> rating -> title = "fmt_title"
 "Recently Added" -> album ? entryage < "4" & commitid > "0" -> title = "fmt_title"
-"A to Z..." ==> "a2z"
-"History..." ==> "runtime"
-"Same as current..." ==> "same"
-"Search..." ==> "search"
-"Custom view..."  ==> "custom"
+"History" ==> "runtime"
+"Same as current" ==> "same"
+"Custom view"  ==> "custom"
 
 # And finally set main menu as our root menu
 %root_menu "main"