diff --git a/lib/screens/discover_screen.dart b/lib/screens/discover_screen.dart
index 76a406a1..1875f94a 100644
--- a/lib/screens/discover_screen.dart
+++ b/lib/screens/discover_screen.dart
@@ -183,6 +183,7 @@ class _DiscoverScreenState extends State<DiscoverScreen>
   }
 
   void _focusTopBoundary() {
+    if (!(ModalRoute.of(context)?.isCurrent ?? false)) return;
     if (_isHeroSectionVisible) {
       _heroFocusNode.requestFocus();
     } else {
@@ -710,7 +711,7 @@ class _DiscoverScreenState extends State<DiscoverScreen>
       if (!_initialLoadComplete && onDeck.isNotEmpty) {
         _initialLoadComplete = true;
         WidgetsBinding.instance.addPostFrameCallback((_) {
-          if (mounted && _heroFocusNode.canRequestFocus) {
+          if (mounted && _heroFocusNode.canRequestFocus && (ModalRoute.of(context)?.isCurrent ?? false)) {
             _heroFocusNode.requestFocus();
           }
         });