diff --git a/mopidy_subidy/subsonic_api.py b/mopidy_subidy/subsonic_api.py
index 861837d..04f56f1 100644
--- a/mopidy_subidy/subsonic_api.py
+++ b/mopidy_subidy/subsonic_api.py
@@ -158,7 +158,9 @@ class SubsonicApi():
             return None
         directory = response.get('directory')
         if directory is not None:
-            return directory.get('child')
+            diritems = directory.get('child')
+            sorted_diritems = sorted(diritems, key=lambda a: (a['isDir'], (a['title'] if a['isDir'] else int(a['track']))))
+            return sorted_diritems
         return None
 
     def get_raw_albums(self, artist_id):