diff --git a/server/handler/handler_sub_by_folder.go b/server/handler/handler_sub_by_folder.go
index d2057b5..4b0c98c 100644
--- a/server/handler/handler_sub_by_folder.go
+++ b/server/handler/handler_sub_by_folder.go
@@ -3,6 +3,7 @@ package handler
 import (
 	"fmt"
 	"net/http"
+	"sort"
 	"strings"
 
 	"github.com/jinzhu/gorm"
@@ -36,6 +37,9 @@ func (c *Controller) GetIndexes(w http.ResponseWriter, r *http.Request) {
 		index.Artists = append(index.Artists,
 			makeArtistFromFolder(&folder))
 	}
+	sort.Slice(indexes[:], func(i, j int) bool {
+		return indexes[i].Name < indexes[j].Name
+	})
 	sub := subsonic.NewResponse()
 	sub.Indexes = &subsonic.Indexes{
 		LastModified: 0,
diff --git a/server/handler/test_data/test_get_indexes_id_two b/server/handler/test_data/test_get_indexes_id_two
index 8703106..e4af9c8 100644
--- a/server/handler/test_data/test_get_indexes_id_two
+++ b/server/handler/test_data/test_get_indexes_id_two
@@ -5,6 +5,15 @@
     "indexes": {
       "lastModified": 0,
       "index": [
+        {
+          "name": "#",
+          "artist": [
+            {
+              "id": 5,
+              "name": "13th Floor Lowervators"
+            }
+          ]
+        },
         {
           "name": "A",
           "artist": [
@@ -17,15 +26,6 @@
               "name": "Anika"
             }
           ]
-        },
-        {
-          "name": "#",
-          "artist": [
-            {
-              "id": 5,
-              "name": "13th Floor Lowervators"
-            }
-          ]
         }
       ]
     }