diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js
index 220be3c872..106d084492 100644
--- a/dashboard-ui/scripts/metadataimagespage.js
+++ b/dashboard-ui/scripts/metadataimagespage.js
@@ -286,7 +286,8 @@
             loadTabs(page, [
 
                 { name: 'Game', type: 'Game' },
-                { name: 'Game System', type: 'GameSystem' }
+                { name: 'Game System', type: 'GameSystem' },
+                { name: 'Game Genre', type: 'GameGenre' }
             ]);
 
             $('.gamesTab', page).addClass('ui-btn-active');
@@ -320,7 +321,8 @@
                 { name: 'Artist', type: 'MusicArtist' },
                 { name: 'Album', type: 'MusicAlbum' },
                 { name: 'Song', type: 'Audio' },
-                { name: 'Music Video', type: 'MusicVideo' }
+                { name: 'Music Video', type: 'MusicVideo' },
+                { name: 'Music Genre', type: 'MusicGenre' }
             ]);
 
             $('.musicTab', page).addClass('ui-btn-active');
@@ -331,8 +333,6 @@
 
                 { name: 'Person', type: 'Person' },
                 { name: 'Genre', type: 'Genre' },
-                { name: 'Game Genre', type: 'GameGenre' },
-                { name: 'Music Genre', type: 'MusicGenre' },
                 { name: 'Studio', type: 'Studio' },
                 { name: 'Book', type: 'Book' },
                 { name: 'Adult Video', type: 'AdultVideo' }
@@ -362,12 +362,18 @@
         });
 
         if ($('.backdropFields:visible', form).length) {
-            
+
             config.ImageOptions.push({
                 Type: 'Backdrop',
                 Limit: $('#txtMaxBackdrops', form).val(),
                 MinWidth: $('#txtMinBackdropDownloadWidth', form).val()
             });
+        } else {
+            config.ImageOptions.push({
+                Type: 'Backdrop',
+                Limit: 0,
+                MinWidth: 0
+            });
         }
 
         if ($('.screenshotFields:visible', form).length) {
@@ -377,6 +383,12 @@
                 Limit: $('#txtMaxScreenshots', form).val(),
                 MinWidth: $('#txtMinScreenshotDownloadWidth', form).val()
             });
+        } else {
+            config.ImageOptions.push({
+                Type: 'Screenshot',
+                Limit: 0,
+                MinWidth: 0
+            });
         }
     }