diff --git a/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt b/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
index 5ef7a763..579c4e75 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
@@ -683,7 +683,8 @@ val advancedPreferences =
             preferences =
                 listOf(
                     AppPreference.CombineContinueNext,
-                    AppPreference.NavDrawerSwitchOnFocus,
+                    // Temporarily disabled, see https://github.com/damontecres/Wholphin/pull/127#issuecomment-3478058418
+//                    AppPreference.NavDrawerSwitchOnFocus,
                     AppPreference.ControllerTimeout,
                 ),
         ),
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/nav/NavDrawer.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/nav/NavDrawer.kt
index f8f37703..bc18b47c 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/nav/NavDrawer.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/nav/NavDrawer.kt
@@ -253,7 +253,8 @@ fun NavDrawer(
             }
         }
     }
-    if (preferences.appPreferences.interfacePreferences.navDrawerSwitchOnFocus) {
+    // Temporarily disabled, see https://github.com/damontecres/Wholphin/pull/127#issuecomment-3478058418
+    if (false && preferences.appPreferences.interfacePreferences.navDrawerSwitchOnFocus) {
         LaunchedEffect(derivedFocusedIndex) {
             val index = derivedFocusedIndex
             delay(600)