diff --git a/Shared/Coordinators/ItemOverviewCoordinator.swift b/Shared/Coordinators/ItemOverviewCoordinator.swift
index cf80b4f9..870109ec 100644
--- a/Shared/Coordinators/ItemOverviewCoordinator.swift
+++ b/Shared/Coordinators/ItemOverviewCoordinator.swift
@@ -24,6 +24,10 @@ final class ItemOverviewCoordinator: NavigationCoordinatable {
     }
     
     @ViewBuilder func makeStart() -> some View {
+        #if os(tvOS)
+        EmptyView()
+        #else
         ItemOverviewView(item: item)
+        #endif
     }
 }
diff --git a/Swiftfin.xcodeproj/project.pbxproj b/Swiftfin.xcodeproj/project.pbxproj
index d0ced680..24b84283 100644
--- a/Swiftfin.xcodeproj/project.pbxproj
+++ b/Swiftfin.xcodeproj/project.pbxproj
@@ -433,6 +433,8 @@
 		E1EBCB42278BD174009FE6E9 /* TruncatedTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1EBCB41278BD174009FE6E9 /* TruncatedTextView.swift */; };
 		E1EBCB44278BD1CE009FE6E9 /* ItemOverviewCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1EBCB43278BD1CE009FE6E9 /* ItemOverviewCoordinator.swift */; };
 		E1EBCB46278BD595009FE6E9 /* ItemOverviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1EBCB45278BD595009FE6E9 /* ItemOverviewView.swift */; };
+		E1EBCB4A278BE443009FE6E9 /* ItemOverviewCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1EBCB43278BD1CE009FE6E9 /* ItemOverviewCoordinator.swift */; };
+		E1EBCB4B278BE5BC009FE6E9 /* ItemOverviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1EBCB45278BD595009FE6E9 /* ItemOverviewView.swift */; };
 		E1F0204E26CCCA74001C1C3B /* VideoPlayerJumpLength.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1F0204D26CCCA74001C1C3B /* VideoPlayerJumpLength.swift */; };
 		E1F0204F26CCCA74001C1C3B /* VideoPlayerJumpLength.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1F0204D26CCCA74001C1C3B /* VideoPlayerJumpLength.swift */; };
 		E1FA2F7427818A8800B4C270 /* SmallMenuOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1FA2F7327818A8800B4C270 /* SmallMenuOverlay.swift */; };
@@ -2093,6 +2095,7 @@
 				E1E5D5462783C28100692DFE /* CinematicItemAboutView.swift in Sources */,
 				E1FCD09726C47118007C8DCF /* ErrorMessage.swift in Sources */,
 				E193D53527193F8100900D82 /* ItemCoordinator.swift in Sources */,
+				E1EBCB4A278BE443009FE6E9 /* ItemOverviewCoordinator.swift in Sources */,
 				53116A19268B947A003024C9 /* PlainLinkButton.swift in Sources */,
 				C4BE07772725EBEA003F4AD1 /* LiveTVProgramsViewModel.swift in Sources */,
 				536D3D88267C17350004248C /* PublicUserButton.swift in Sources */,
@@ -2127,6 +2130,7 @@
 				535870A82669D8AE00D05A09 /* StringExtensions.swift in Sources */,
 				53A83C33268A309300DF3D92 /* LibraryView.swift in Sources */,
 				62E632ED267D410B0063E547 /* SeriesItemViewModel.swift in Sources */,
+				E1EBCB4B278BE5BC009FE6E9 /* ItemOverviewView.swift in Sources */,
 				5398514526B64DA100101B49 /* SettingsView.swift in Sources */,
 				62E632F0267D43320063E547 /* LibraryFilterViewModel.swift in Sources */,
 				E193D54B271941D300900D82 /* ServerListView.swift in Sources */,
diff --git a/Swiftfin/Components/EpisodesRowView.swift b/Swiftfin/Components/EpisodesRowView.swift
index 605a9142..aee0e7c7 100644
--- a/Swiftfin/Components/EpisodesRowView.swift
+++ b/Swiftfin/Components/EpisodesRowView.swift
@@ -106,6 +106,13 @@ struct EpisodesRowView: View {
                                                           bh: episode.getBackdropImageBlurHash())
                                                     .mask(Rectangle().frame(width: 200, height: 112).cornerRadius(10))
                                                     .frame(width: 200, height: 112)
+                                                    .overlay {
+                                                        if episode.id == viewModel.episodeItemViewModel.item.id {
+                                                            RoundedRectangle(cornerRadius: 6)
+                                                                .stroke(Color.jellyfinPurple, lineWidth: 4)
+                                                        }
+                                                    }
+                                                    .padding(.top)
         
                                                 VStack(alignment: .leading) {
                                                     Text(episode.getEpisodeLocator() ?? "")
diff --git a/Swiftfin/Views/ItemView/ItemViewBody.swift b/Swiftfin/Views/ItemView/ItemViewBody.swift
index 548a20ac..a7ed4e8d 100644
--- a/Swiftfin/Views/ItemView/ItemViewBody.swift
+++ b/Swiftfin/Views/ItemView/ItemViewBody.swift
@@ -30,7 +30,8 @@ struct ItemViewBody: View {
                                       font: UIFont.preferredFont(forTextStyle: .footnote)) {
                         itemRouter.route(to: \.itemOverview, viewModel.item)
                     }
-                                      .padding()
+                                      .padding(.horizontal)
+                                      .padding(.top)
                 } else {
                     Text(itemOverview)
                         .font(.footnote)