diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 5d39f6554cd..8159b2510da 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -1681,6 +1681,24 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                 attachBackPressedCallback("MainActivity") {
                     showConfirmExitDialog(settingsManager)
                 }
+                // Re-point nav rail focus at the provider button on every arrival
+                // (rail button, back stack pop, first load), so D-pad right always
+                // reaches the "None" / provider selector button.
+                if (isLayout(TV or EMULATOR)) {
+                    val fromView = binding?.navRailView
+                    if (fromView != null) {
+                        fromView.nextFocusRightId = R.id.home_change_api
+                        for (focusView in arrayOf(
+                            R.id.navigation_downloads,
+                            R.id.navigation_home,
+                            R.id.navigation_search,
+                            R.id.navigation_library,
+                            R.id.navigation_settings,
+                        )) {
+                            fromView.findViewById<View?>(focusView)?.nextFocusRightId = R.id.home_change_api
+                        }
+                    }
+                }
             } else detachBackPressedCallback("MainActivity")
         }