diff --git a/components/movies/MovieDetails.brs b/components/movies/MovieDetails.brs
index 6e59a068..50e96948 100644
--- a/components/movies/MovieDetails.brs
+++ b/components/movies/MovieDetails.brs
@@ -24,7 +24,11 @@ end sub
 
 sub OnScreenShown()
     ' set focus to button group
-    m.buttonGrp.setFocus(true)
+    if m.extrasGrp.opacity = 1
+        m.top.lastFocus.setFocus(true)
+    else
+        m.buttonGrp.setFocus(true)
+    end if
 end sub
 
 
@@ -297,6 +301,7 @@ function onKeyEvent(key as string, press as boolean) as boolean
     end if
 
     if key = "down" and m.buttonGrp.isInFocusChain()
+        m.top.lastFocus = m.extrasGrid
         m.extrasGrid.setFocus(true)
         m.top.findNode("VertSlider").reverse = false
         m.top.findNode("extrasFader").reverse = false
@@ -306,6 +311,7 @@ function onKeyEvent(key as string, press as boolean) as boolean
 
     if key = "up" and m.top.findNode("extrasGrid").isInFocusChain()
         if m.extrasGrid.itemFocused = 0
+            m.top.lastFocus = m.buttonGrp
             m.top.findNode("VertSlider").reverse = true
             m.top.findNode("extrasFader").reverse = true
             m.top.findNode("pplAnime").control = "start"