diff --git a/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackPage.kt b/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackPage.kt
index 7f154064..4bf0f763 100644
--- a/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackPage.kt
+++ b/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackPage.kt
@@ -183,17 +183,17 @@ fun PlaybackPage(
 
             Box(
                 modifier
-                    .background(Color.Black)
-                    .onKeyEvent(keyHandler::onKeyEvent)
-                    .focusRequester(focusRequester)
-                    .focusable(),
+                    .background(Color.Black),
             ) {
                 val playerSize by animateFloatAsState(if (nextUp == null) 1f else .66f)
                 Box(
                     modifier =
                         Modifier
                             .fillMaxSize(playerSize)
-                            .align(Alignment.TopCenter),
+                            .align(Alignment.TopCenter)
+                            .onKeyEvent(keyHandler::onKeyEvent)
+                            .focusRequester(focusRequester)
+                            .focusable(),
                 ) {
                     PlayerSurface(
                         player = player,
@@ -354,7 +354,7 @@ fun PlaybackPage(
 
                 // Next up episode
                 BackHandler(nextUp != null) {
-                    viewModel.cancelUpNextEpisode()
+                    viewModel.navigationManager.goBack()
                 }
                 AnimatedVisibility(
                     nextUp != null,
@@ -374,7 +374,6 @@ fun PlaybackPage(
                                 preferences.appPreferences.playbackPreferences.autoPlayNextDelaySeconds,
                             )
                         }
-                        // TODO need extra back press for some reason
                         BackHandler(timeLeft > 0 && autoPlayEnabled) {
                             timeLeft = -1
                             autoPlayEnabled = false
diff --git a/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackViewModel.kt b/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackViewModel.kt
index 763b4a28..157ce0b1 100644
--- a/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackViewModel.kt
+++ b/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackViewModel.kt
@@ -22,6 +22,7 @@ import com.github.damontecres.dolphin.preferences.UserPreferences
 import com.github.damontecres.dolphin.ui.DefaultItemFields
 import com.github.damontecres.dolphin.ui.indexOfFirstOrNull
 import com.github.damontecres.dolphin.ui.nav.Destination
+import com.github.damontecres.dolphin.ui.nav.NavigationManager
 import com.github.damontecres.dolphin.util.ApiRequestPager
 import com.github.damontecres.dolphin.util.EqualityMutableLiveData
 import com.github.damontecres.dolphin.util.ExceptionHandler
@@ -85,6 +86,7 @@ class PlaybackViewModel
     constructor(
         @ApplicationContext context: Context,
         val api: ApiClient,
+        val navigationManager: NavigationManager,
     ) : ViewModel() {
         val player: ExoPlayer =
             ExoPlayer