diff --git a/src/components/metadataEditor/metadataEditor.js b/src/components/metadataEditor/metadataEditor.js
index 7f84d1410..df5ef5f23 100644
--- a/src/components/metadataEditor/metadataEditor.js
+++ b/src/components/metadataEditor/metadataEditor.js
@@ -589,17 +589,17 @@ function setFieldVisibilities(context, item) {
         hideElement('#fld3dFormat', context);
     }
 
-    if (item.Type === 'Audio') {
+    if (item.Type === BaseItemKind.Audio || item.Type === BaseItemKind.MusicAlbum || item.Type === BaseItemKind.MusicVideo) {
+        showElement('#fldArtist', context);
         showElement('#fldAlbumArtist', context);
     } else {
+        hideElement('#fldArtist', context);
         hideElement('#fldAlbumArtist', context);
     }
 
-    if (item.Type === 'Audio' || item.Type === 'MusicVideo') {
-        showElement('#fldArtist', context);
+    if (item.Type === BaseItemKind.Audio || item.Type === BaseItemKind.MusicVideo) {
         showElement('#fldAlbum', context);
     } else {
-        hideElement('#fldArtist', context);
         hideElement('#fldAlbum', context);
     }