diff --git a/static/js/pandora/URL.js b/static/js/pandora/URL.js
index 9ac2a4255..d185231f2 100644
--- a/static/js/pandora/URL.js
+++ b/static/js/pandora/URL.js
@@ -109,6 +109,9 @@ pandora.URL = (function() {
         update: function() {
             var oldUserUI = Ox.clone(pandora.user.ui);
             Ox.Request.cancel();
+            $('video').each(function() {
+                $(this).trigger('ended');
+            });
             this.parse();
             if (pandora.user.ui.section != oldUserUI.section) {
                 pandora.$ui.appPanel.replaceElement(1, pandora.$ui.mainPanel = pandora.ui.mainPanel());
diff --git a/static/js/pandora/ui/list.js b/static/js/pandora/ui/list.js
index cf146f329..f7a58f436 100644
--- a/static/js/pandora/ui/list.js
+++ b/static/js/pandora/ui/list.js
@@ -268,6 +268,8 @@ pandora.ui.list = function() { // fixme: remove view argument
                             $video.addClass('OxSelectedVideo');
                         }, 300);
                     }
+                } else {
+                    $('.OxSelectedVideo').removeClass('OxSelectedVideo');
                 }
             }
         });