diff --git a/src/controllers/movies/movies.html b/src/controllers/movies/movies.html
index 63fe332a8e..a101348f49 100644
--- a/src/controllers/movies/movies.html
+++ b/src/controllers/movies/movies.html
@@ -3,10 +3,10 @@
     <div class="pageTabContent" id="moviesTab" data-index="0">
         <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="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy" 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>
-            <button is="paper-icon-button-light" class="btnShuffle autoSize" title="${Shuffle}"><span class="material-icons shuffle" aria-hidden="true"></span></button>
         </div>
 
         <div class="alphaPicker alphaPicker-fixed alphaPicker-vertical">
diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js
index 22f0c18469..9446da1b95 100644
--- a/src/controllers/movies/movies.js
+++ b/src/controllers/movies/movies.js
@@ -30,6 +30,15 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
             return ApiClient.getItems(ApiClient.getCurrentUserId(), query);
         }
 
+        function shuffle() {
+            ApiClient.getItem(
+                ApiClient.getCurrentUserId(),
+                params.topParentId
+            ).then((item) => {
+                playbackManager.shuffle(item);
+            });
+        }
+
         const afterRefresh = (result) => {
             function onNextPageClick() {
                 if (isLoading) {
@@ -53,19 +62,6 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
                 itemsContainer.refreshItems();
             }
 
-            function onShuffleClick() {
-                if (isLoading) {
-                    return;
-                }
-
-                ApiClient.getItem(
-                    ApiClient.getCurrentUserId(),
-                    params.topParentId
-                ).then(item => {
-                    playbackManager.shuffle(item);
-                });
-            }
-
             window.scrollTo(0, 0);
             this.alphaPicker?.updateControls(query);
             const pagingHtml = libraryBrowser.getQueryPagingHtml({
@@ -91,10 +87,6 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
                 elem.addEventListener('click', onPreviousPageClick);
             }
 
-            for (const elem of tabContent.querySelectorAll('.btnShuffle')) {
-                elem.addEventListener('click', onShuffleClick);
-            }
-
             isLoading = false;
             loading.hide();
 
@@ -261,6 +253,8 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
                 onViewStyleChange();
                 itemsContainer.refreshItems();
             });
+
+            tabContent.querySelector('.btnShuffle').addEventListener('click', shuffle);
         };
 
         let itemsContainer = tabContent.querySelector('.itemsContainer');