diff --git a/components/tvshows/TVEpisodes.bs b/components/tvshows/TVEpisodes.bs
index ffc225cdc..57164ceb3 100644
--- a/components/tvshows/TVEpisodes.bs
+++ b/components/tvshows/TVEpisodes.bs
@@ -93,6 +93,8 @@ function onKeyEvent(key as string, press as boolean) as boolean
             focusedItem = getFocusedItem()
             if isValid(focusedItem)
                 m.top.selectedItem = focusedItem
+                'Prevent the selected item event from double firing
+                m.top.selectedItem = invalid
             end if
             return true
         end if
diff --git a/source/ShowScenes.bs b/source/ShowScenes.bs
index 353ee136e..3610b2498 100644
--- a/source/ShowScenes.bs
+++ b/source/ShowScenes.bs
@@ -811,7 +811,7 @@ function CreateSeasonDetailsGroupByID(seriesID as string, seasonID as string) as
     group.objects = TVEpisodes(seriesID, seasonID)
     group.episodeObjects = group.objects
     ' watch for button presses
-    group.observeField("episodeSelected", m.port)
+    group.observeField("selectedItem", m.port)
     group.observeField("quickPlayNode", m.port)
     ' don't wait for the extras button
     stopLoadingSpinner()