diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index 7203e51cbc..de246476fd 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -285,18 +285,6 @@
 
         var mdlTabs = view.querySelector('.libraryViewNav');
 
-        function onPlaybackStop(e, state) {
-
-            if (state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video') {
-
-                mdlTabs.dispatchEvent(new CustomEvent("tabchange", {
-                    detail: {
-                        selectedTabIndex: libraryBrowser.selectedTab(mdlTabs)
-                    }
-                }));
-            }
-        }
-
         var baseUrl = 'movies.html';
         var topParentId = params.topParentId;
         if (topParentId) {
@@ -383,6 +371,19 @@
             }
         });
 
+        function onPlaybackStop(e, state) {
+
+            if (state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video') {
+
+                renderedTabs = [];
+                mdlTabs.dispatchEvent(new CustomEvent("tabchange", {
+                    detail: {
+                        selectedTabIndex: libraryBrowser.selectedTab(mdlTabs)
+                    }
+                }));
+            }
+        }
+
         view.addEventListener('viewshow', function (e) {
             Events.on(MediaController, 'playbackstop', onPlaybackStop);
         });
diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js
index 92f424c1f3..7ee10c4568 100644
--- a/dashboard-ui/scripts/tvrecommended.js
+++ b/dashboard-ui/scripts/tvrecommended.js
@@ -234,6 +234,7 @@
 
             if (state.NowPlayingItem && state.NowPlayingItem.MediaType == 'Video') {
 
+                renderedTabs = [];
                 mdlTabs.dispatchEvent(new CustomEvent("tabchange", {
                     detail: {
                         selectedTabIndex: libraryBrowser.selectedTab(mdlTabs)