diff --git a/Swiftfin tvOS/Views/ItemView/Components/EpisodeSelector/Components/EpisodeHStack.swift b/Swiftfin tvOS/Views/ItemView/Components/EpisodeSelector/Components/EpisodeHStack.swift
index 8c2861ea..e228d506 100644
--- a/Swiftfin tvOS/Views/ItemView/Components/EpisodeSelector/Components/EpisodeHStack.swift	
+++ b/Swiftfin tvOS/Views/ItemView/Components/EpisodeSelector/Components/EpisodeHStack.swift	
@@ -85,6 +85,11 @@ extension SeriesEpisodeSelector {
                 guard let newValue else { return }
                 lastFocusedEpisodeID = newValue
             }
+            .onChange(of: viewModel.state) { _, newValue in
+                if newValue == .content {
+                    lastFocusedEpisodeID = viewModel.elements.first?.id
+                }
+            }
         }
     }