From 089ad1acee8b084aed1a6c53e3b43d3afcbfae0f Mon Sep 17 00:00:00 2001
From: Jimi <jimi@thedodgefamily.com>
Date: Sat, 20 May 2023 21:24:52 -0600
Subject: [PATCH] Fix navigation.

---
 components/tvshows/TVEpisodes.brs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/tvshows/TVEpisodes.brs b/components/tvshows/TVEpisodes.brs
index db313a26..e0ad9587 100644
--- a/components/tvshows/TVEpisodes.brs
+++ b/components/tvshows/TVEpisodes.brs
@@ -42,7 +42,7 @@ end sub
 function onKeyEvent(key as string, press as boolean) as boolean
     handled = false
 
-    if key = "left" and not m.Shuffle.hasFocus()
+    if key = "left" and m.tvEpisodeRow.hasFocus()
         m.Shuffle.setFocus(true)
         return true
     end if
@@ -57,7 +57,7 @@ function onKeyEvent(key as string, press as boolean) as boolean
         return true
     end if
 
-    if key = "right" and not m.tvEpisodeRow.hasFocus()
+    if key = "right" and (m.Random.hasFocus() or m.Shuffle.hasFocus())
         m.tvEpisodeRow.setFocus(true)
         return true
     end if