diff --git a/src/controllers/music/music.html b/src/controllers/music/music.html
index 7096ce96fa..aad1fe545d 100644
--- a/src/controllers/music/music.html
+++ b/src/controllers/music/music.html
@@ -92,6 +92,7 @@
     <div class="pageTabContent" id="songsTab" data-index="5">
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom focuscontainer-x">
             <div class="paging"></div>
+            <button is="paper-icon-button-light" class="btnShuffle autoSize" title="${Shuffle}"><span class="material-icons shuffle" aria-hidden="true"></span></button>
             <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha" aria-hidden="true"></span></button>
             <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list" aria-hidden="true"></span></button>
         </div>
diff --git a/src/controllers/music/songs.js b/src/controllers/music/songs.js
index 0b8bea56e3..1af8314235 100644
--- a/src/controllers/music/songs.js
+++ b/src/controllers/music/songs.js
@@ -8,6 +8,7 @@ import * as userSettings from '../../scripts/settings/userSettings';
 import globalize from '../../scripts/globalize';
 import '../../elements/emby-itemscontainer/emby-itemscontainer';
 import Dashboard from '../../utils/dashboard';
+import {playbackManager} from '../../components/playback/playbackmanager';
 
 export default function (view, params, tabContent) {
     function getPageData(context) {
@@ -144,6 +145,12 @@ export default function (view, params, tabContent) {
         });
     };
 
+    function shuffle() {
+        ApiClient.getItem(ApiClient.getCurrentUserId(), params.topParentId).then(function (item) {
+            playbackManager.shuffle(item);
+        });
+    }
+
     self.getCurrentViewStyle = function () {
         return getPageData(tabContent).view;
     };
@@ -190,6 +197,7 @@ export default function (view, params, tabContent) {
                 button: e.target
             });
         });
+        tabContent.querySelector('.btnShuffle').addEventListener('click', shuffle);
     }
 
     initPage(tabContent);