diff --git a/components/ItemGrid/MovieLibraryView.brs b/components/ItemGrid/MovieLibraryView.brs
index 05323786..ba8326bd 100644
--- a/components/ItemGrid/MovieLibraryView.brs
+++ b/components/ItemGrid/MovieLibraryView.brs
@@ -371,6 +371,10 @@ sub ItemDataLoaded(msg)
 
         m.loading = false
         m.spinner.visible = false
+        ' Return focus to options menu if it was opened while library was loading
+        if m.options.visible
+            m.options.setFocus(true)
+        end if
         return
     end if
 
@@ -413,6 +417,10 @@ sub ItemDataLoaded(msg)
     end if
 
     m.spinner.visible = false
+    ' Return focus to options menu if it was opened while library was loading
+    if m.options.visible
+        m.options.setFocus(true)
+    end if
 end sub
 
 '