diff --git a/resources/cider-ui-tests/index.js b/resources/cider-ui-tests/index.js
index e2800ca8..cce7a8d2 100644
--- a/resources/cider-ui-tests/index.js
+++ b/resources/cider-ui-tests/index.js
@@ -128,7 +128,7 @@ const app = new Vue({
         },
         page: "artist-page",
         pageHistory: [],
-        songstest: true
+        songstest: false
     },
     methods: {
         async init() {
@@ -359,6 +359,10 @@ const app = new Vue({
                     // sort this.library.songs.displayListing by song.attributes[self.library.songs.sorting] in ascending order based on alphabetical order and numeric order
                     // check if song.attributes[self.library.songs.sorting] is a number and if so, sort by number if not, sort by alphabetical order ignoring case
                     self.library.songs.displayListing.sort((a, b) => {
+                        if(self.library.songs.sorting == "genre") {
+                            aa = a.attributes.genreNames[0]
+                            bb = b.attributes.genreNames[0]
+                        }
                         let aa = a.attributes[self.library.songs.sorting]
                         let bb = b.attributes[self.library.songs.sorting]
                         if (aa == null) {
@@ -378,6 +382,10 @@ const app = new Vue({
                     // sort this.library.songs.displayListing by song.attributes[self.library.songs.sorting] in descending order based on alphabetical order and numeric order
                     // check if song.attributes[self.library.songs.sorting] is a number and if so, sort by number if not, sort by alphabetical order ignoring case
                     self.library.songs.displayListing.sort((a, b) => {
+                        if(self.library.songs.sorting == "genre") {
+                            aa = a.attributes.genreNames[0]
+                            bb = b.attributes.genreNames[0]
+                        }
                         let aa = a.attributes[self.library.songs.sorting]
                         let bb = b.attributes[self.library.songs.sorting]
                         if (aa == null) {
diff --git a/resources/cider-ui-tests/views/pages/library-songs.ejs b/resources/cider-ui-tests/views/pages/library-songs.ejs
index fa5f5d8c..290e29a9 100644
--- a/resources/cider-ui-tests/views/pages/library-songs.ejs
+++ b/resources/cider-ui-tests/views/pages/library-songs.ejs
@@ -1,14 +1,31 @@
 <template v-if="page == 'library-songs'">
     <div class="content-inner">
         <h1 class="header-text">Songs</h1>
-        <div class="search-input-container" style="width:100%;margin: 16px 0px;">
-            <div class="search-input--icon"></div>
-            <input type="search"
-                   style="width:100%;"
-                   spellcheck="false"
-                   placeholder="Search..."
-                   @input="searchLibrarySongs"
-                   v-model="library.songs.search" class="search-input">
+        <div class="row">
+            <div class="col" style="padding:0px;">
+                <div class="search-input-container" style="width:100%;margin: 16px 0px;">
+                    <div class="search-input--icon"></div>
+                    <input type="search"
+                           style="width:100%;"
+                           spellcheck="false"
+                           placeholder="Search..."
+                           @input="searchLibrarySongs"
+                           v-model="library.songs.search" class="search-input">
+                </div>
+            </div>
+            <div class="col-auto flex-center">
+                <select class="md-select" v-model="library.songs.sorting" @change="searchLibrarySongs()">
+                    <optgroup label="Sort By">
+                        <option v-for="(sort, index) in library.sortingOptions" :value="index">{{ sort }}</option>
+                    </optgroup>
+                </select>
+                <select class="md-select" v-model="library.songs.sortOrder" @change="searchLibrarySongs()">
+                    <optgroup label="Sort Order">
+                        <option value="asc">Ascending</option>
+                        <option value="desc">Descending</option>
+                    </optgroup>
+                </select>
+            </div>
         </div>
         <div v-if="library.songs.downloadState == 3">Library contains no songs.</div>
         <mediaitem-list-item :item="item"