diff --git a/src/controllers/music/musicalbums.js b/src/controllers/music/musicalbums.js
index 5bb8546e76..5ecb553024 100644
--- a/src/controllers/music/musicalbums.js
+++ b/src/controllers/music/musicalbums.js
@@ -155,20 +155,21 @@ import 'emby-itemscontainer';
                         overlayPlayButton: true
                     });
                 }
+
                 let elems = tabContent.querySelectorAll('.paging');
 
-                for (let i = 0, length = elems.length; i < length; i++) {
-                    elems[i].innerHTML = pagingHtml;
+                for (const elem of elems) {
+                    elem.innerHTML = pagingHtml;
                 }
 
                 elems = tabContent.querySelectorAll('.btnNextPage');
-                for (let i = 0, length = elems.length; i < length; i++) {
-                    elems[i].addEventListener('click', onNextPageClick);
+                for (const elem of elems) {
+                    elem.addEventListener('click', onNextPageClick);
                 }
 
                 elems = tabContent.querySelectorAll('.btnPreviousPage');
-                for (let i = 0, length = elems.length; i < length; i++) {
-                    elems[i].addEventListener('click', onPreviousPageClick);
+                for (const elem of elems) {
+                    elem.addEventListener('click', onPreviousPageClick);
                 }
 
                 const itemsContainer = tabContent.querySelector('.itemsContainer');
@@ -209,10 +210,12 @@ import 'emby-itemscontainer';
                     mode: 'albums',
                     serverId: ApiClient.serverId()
                 });
+
                 events.on(filterDialog, 'filterchange', function () {
                     getQuery().StartIndex = 0;
                     reloadItems(tabContent);
                 });
+
                 filterDialog.show();
             });
         };
@@ -232,6 +235,7 @@ import 'emby-itemscontainer';
                 query.StartIndex = 0;
                 reloadItems(tabContent);
             });
+
             this.alphaPicker = new AlphaPicker({
                 element: alphaPickerElement,
                 valueChangeEvent: 'click'
@@ -244,6 +248,7 @@ import 'emby-itemscontainer';
             tabContent.querySelector('.btnFilter').addEventListener('click', () => {
                 this.showFilterMenu();
             });
+
             tabContent.querySelector('.btnSort').addEventListener('click', (e) => {
                 libraryBrowser.showSortMenu({
                     items: [{
@@ -276,10 +281,12 @@ import 'emby-itemscontainer';
                     button: e.target
                 });
             });
+
             const btnSelectView = tabContent.querySelector('.btnSelectView');
             btnSelectView.addEventListener('click', (e) => {
                 libraryBrowser.showLayoutMenu(e.target, this.getCurrentViewStyle(), 'List,Poster,PosterCard'.split(','));
             });
+
             btnSelectView.addEventListener('layoutchange', function (e) {
                 const viewStyle = e.detail.viewStyle;
                 getPageData().view = viewStyle;
@@ -288,6 +295,7 @@ import 'emby-itemscontainer';
                 onViewStyleChange();
                 reloadItems(tabContent);
             });
+
             tabContent.querySelector('.btnPlayAll').addEventListener('click', playAll);
             tabContent.querySelector('.btnShuffle').addEventListener('click', shuffle);
         };