diff --git a/plugin/music/__init__.py b/plugin/music/__init__.py
index 1d60ff0..ca441f5 100644
--- a/plugin/music/__init__.py
+++ b/plugin/music/__init__.py
@@ -12,11 +12,14 @@ def execute(cinput: ControlInput, graphics: Graphics, directory: str):
 
 def create_directory_menu(directory: str, dirname: str):
     sub_menu = list()
-    for fname in listdir(directory):
+    for fname in sorted(listdir(directory)):
         new_path = path.join(directory, fname)
         if path.isdir(new_path):
             sub_menu.append(create_directory_menu(new_path, fname))
     if len(sub_menu) > 0:
         return MenuItem(dirname, MenuType.SUB_MENU, {"sub_menu": sub_menu})
     else:
-        return MenuItem(dirname, MenuType.CMD, {"directory": directory})
+        if dirname.startswith("_"):
+            return MenuItem(dirname.lstrip("_"), MenuType.CMD, {"random": directory})
+        else:
+            return MenuItem(dirname, MenuType.CMD, {"album": directory})