diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/itembynamedetailpage.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/itembynamedetailpage.js
index 231e7df063..d675c02efb 100644
--- a/MediaBrowser.WebDashboard/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/MediaBrowser.WebDashboard/dashboard-ui/scripts/itembynamedetailpage.js
@@ -320,6 +320,10 @@
 
     function getMoreItemsHref(item, type) {
 
+        if (item.Type == 'Genre' || item.Type == 'MusicGenre' || item.Type == 'GameGenre') {
+            return 'secondaryitems.html?type=' + type + '&genreId=' + item.Id + '&parentId=' + params.topParentId;
+        }
+
         return 'secondaryitems.html?type=' + type + '&parentId=' + item.Id;
     }
 
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/moviegenres.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/moviegenres.js
index c7a80a809a..a146cc3adf 100644
--- a/MediaBrowser.WebDashboard/dashboard-ui/scripts/moviegenres.js
+++ b/MediaBrowser.WebDashboard/dashboard-ui/scripts/moviegenres.js
@@ -60,7 +60,7 @@
 
         function getMoreItemsHref(itemId, type) {
 
-            return 'secondaryitems.html?type=' + type + '&parentId=' + itemId;
+            return 'secondaryitems.html?type=' + type + '&genreId=' + itemId + '&parentId=' + params.topParentId;
         }
 
         dom.addEventListener(tabContent, 'click', function (e) {
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/secondaryitems.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/secondaryitems.js
index 4e0938449d..8bcb50d749 100644
--- a/MediaBrowser.WebDashboard/dashboard-ui/scripts/secondaryitems.js
+++ b/MediaBrowser.WebDashboard/dashboard-ui/scripts/secondaryitems.js
@@ -7,6 +7,10 @@
 
         function addCurrentItemToQuery(query, item) {
 
+            if (params.parentId) {
+                query.ParentId = params.parentId;
+            }
+
             if (item.Type == "Person") {
                 query.PersonIds = item.Id;
             }
@@ -218,8 +222,11 @@
         view.addEventListener('click', onListItemClick);
 
         view.addEventListener('viewbeforeshow', function (e) {
-            if (params.parentId) {
-                ApiClient.getItem(Dashboard.getCurrentUserId(), params.parentId).then(function (parent) {
+
+            var parentId = params.genreId || params.parentId;
+
+            if (parentId) {
+                ApiClient.getItem(Dashboard.getCurrentUserId(), parentId).then(function (parent) {
                     LibraryMenu.setTitle(parent.Name);
 
                     onViewStyleChange(parent);
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/tvgenres.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/tvgenres.js
index f5d0debbbb..5a41885f99 100644
--- a/MediaBrowser.WebDashboard/dashboard-ui/scripts/tvgenres.js
+++ b/MediaBrowser.WebDashboard/dashboard-ui/scripts/tvgenres.js
@@ -60,7 +60,7 @@
 
         function getMoreItemsHref(itemId, type) {
 
-            return 'secondaryitems.html?type=' + type + '&parentId=' + itemId;
+            return 'secondaryitems.html?type=' + type + '&genreId=' + itemId + '&parentId=' + params.topParentId;
         }
 
         dom.addEventListener(tabContent, 'click', function (e) {