diff --git a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js
index af8ed6e2dd..3869a61a95 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js
@@ -316,17 +316,21 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                 textlines.push(displayName);
             }
 
-            if (options.artist !== false && (options.artist === true || item.AlbumArtist !== options.containerAlbumArtist)) {
+            if (item.IsFolder) {
+                if (options.artist !== false) {
 
-                if (item.ArtistItems && item.Type !== 'MusicAlbum') {
-                    textlines.push(item.ArtistItems.map(function (a) {
-                        return a.Name;
-
-                    }).join(', '));
+                    if (item.AlbumArtist && item.Type === 'MusicAlbum') {
+                        textlines.push(item.AlbumArtist);
+                    }
                 }
+            } else {
+                if (options.artist !== false && (options.artist === true || (item.Artists || [])[0] !== options.containerAlbumArtist)) {
 
-                else if (item.AlbumArtist && item.Type === 'MusicAlbum') {
-                    textlines.push(item.AlbumArtist);
+                    if (item.ArtistItems && item.Type !== 'MusicAlbum') {
+                        textlines.push(item.ArtistItems.map(function (a) {
+                            return a.Name;
+                        }).join(', '));
+                    }
                 }
             }