diff --git a/app/src/main/java/net/jeena/jtubetv/ui/screens/HomeRows.kt b/app/src/main/java/net/jeena/jtubetv/ui/screens/HomeRows.kt
index 3def3a1..c3d23da 100644
--- a/app/src/main/java/net/jeena/jtubetv/ui/screens/HomeRows.kt
+++ b/app/src/main/java/net/jeena/jtubetv/ui/screens/HomeRows.kt
@@ -217,7 +217,6 @@ fun HomeRowsScreen(
     restoreToken: Int = 0,
     epoch: Int = 0,
     onOpenDrawer: () -> Unit = {},
-    upToTopBar: (() -> Unit)? = null,
     viewModel: HomeRowsViewModel = viewModel(key = "home$epoch", factory = HomeRowsViewModel.factory),
 ) {
     val continueRestore = androidx.compose.runtime.remember { androidx.compose.runtime.mutableIntStateOf(-1) }
@@ -264,7 +263,6 @@ fun HomeRowsScreen(
                     onLeftAtStart = onOpenDrawer,
                     clickedIndex = continueRestore,
                     restoreToken = restoreToken,
-                    upToTopBar = upToTopBar,
                     autoFocusOnLoad = true,
                     autoFocusAllowed = { !userNavigated },
                 )
@@ -336,7 +334,6 @@ fun FocusScrollRow(
     onLeftAtStart: () -> Unit,
     clickedIndex: androidx.compose.runtime.MutableIntState? = null,   // set on card click
     restoreToken: Int = 0,                                          // bumped when playback ends
-    upToTopBar: (() -> Unit)? = null,                               // first content row only
     // Only the FIRST row auto-focuses its first card when items arrive — every other
     // row would otherwise steal focus whenever it finishes loading (#3).
     autoFocusOnLoad: Boolean = false,
@@ -403,7 +400,6 @@ fun FocusScrollRow(
                 compact = true,
                 progress = progressOf(video.shortUUID),
                 onLeftAtStart = if (index == 0) onLeftAtStart else null,
-                onUpToTopBar = upToTopBar,
                 onFocused = { focusedIndex = index },
             )
             afterItem(index, video)
diff --git a/app/src/main/java/net/jeena/jtubetv/ui/screens/HomeScreen.kt b/app/src/main/java/net/jeena/jtubetv/ui/screens/HomeScreen.kt
index a13eb09..6ceff14 100644
--- a/app/src/main/java/net/jeena/jtubetv/ui/screens/HomeScreen.kt
+++ b/app/src/main/java/net/jeena/jtubetv/ui/screens/HomeScreen.kt
@@ -174,7 +174,6 @@ fun HomeScreen(viewModel: AppViewModel = androidx.lifecycle.viewmodel.compose.vi
                             restoreToken = restoreToken,
                             epoch = epoch,
                             onOpenDrawer = { drawerOpen = true },
-                            upToTopBar = { drawerOpen = true },
                         )
                     else -> when (destination) {
                     Destination.Home ->
@@ -184,7 +183,6 @@ fun HomeScreen(viewModel: AppViewModel = androidx.lifecycle.viewmodel.compose.vi
                             epoch = epoch,
                             onOpenDrawer = { drawerOpen = true },
                             // UP over the first row opens the drawer.
-                            upToTopBar = { drawerOpen = true },
                         )
                     Destination.MyVideos ->
                         VideoListScreen(
@@ -193,7 +191,6 @@ fun HomeScreen(viewModel: AppViewModel = androidx.lifecycle.viewmodel.compose.vi
                             restoreToken = restoreToken,
                             epoch = epoch,
                             onOpenDrawer = { drawerOpen = true },
-                            upToTopBar = { drawerOpen = true },
                         )
                     Destination.Channels -> ChannelsScreen(
                         onOpenChannel = { handle -> channelDetails = handle },
@@ -207,7 +204,6 @@ fun HomeScreen(viewModel: AppViewModel = androidx.lifecycle.viewmodel.compose.vi
                             restoreToken = restoreToken,
                             epoch = epoch,
                             onOpenDrawer = { drawerOpen = true },
-                            upToTopBar = { drawerOpen = true },
                         )
                     Destination.Subscriptions ->
                         VideoListScreen(
@@ -216,7 +212,6 @@ fun HomeScreen(viewModel: AppViewModel = androidx.lifecycle.viewmodel.compose.vi
                             restoreToken = restoreToken,
                             epoch = epoch,
                             onOpenDrawer = { drawerOpen = true },
-                            upToTopBar = { drawerOpen = true },
                         )
                     Destination.History ->
                         VideoListScreen(
@@ -225,7 +220,6 @@ fun HomeScreen(viewModel: AppViewModel = androidx.lifecycle.viewmodel.compose.vi
                             restoreToken = restoreToken,
                             epoch = epoch,
                             onOpenDrawer = { drawerOpen = true },
-                            upToTopBar = { drawerOpen = true },
                         )
                     }
                 }
diff --git a/app/src/main/java/net/jeena/jtubetv/ui/screens/list/VideoCard.kt b/app/src/main/java/net/jeena/jtubetv/ui/screens/list/VideoCard.kt
index 5d4e1a9..a2cfa25 100644
--- a/app/src/main/java/net/jeena/jtubetv/ui/screens/list/VideoCard.kt
+++ b/app/src/main/java/net/jeena/jtubetv/ui/screens/list/VideoCard.kt
@@ -60,7 +60,6 @@ fun VideoCard(
     /** LEFT (only on the row's first card) can open the menu drawer. */
     onLeftAtStart: (() -> Unit)? = null,
     /** Explicit UP-target for the first content row (focus search misses the top bar). */
-    onUpToTopBar: (() -> Unit)? = null,
     /** Notifies the row wrapper when this card gains focus (for eased scrolling). */
     onFocused: (() -> Unit)? = null,
 ) {
@@ -81,9 +80,6 @@ fun VideoCard(
                         direction == androidx.compose.ui.input.key.Key.DirectionLeft && onLeftAtStart != null -> {
                             onLeftAtStart(); true
                         }
-                        direction == androidx.compose.ui.input.key.Key.DirectionUp && onUpToTopBar != null -> {
-                            onUpToTopBar(); true
-                        }
                         else -> false
                     }
                 } else false
diff --git a/app/src/main/java/net/jeena/jtubetv/ui/screens/list/VideoListScreen.kt b/app/src/main/java/net/jeena/jtubetv/ui/screens/list/VideoListScreen.kt
index 02bd0b6..b77ce0e 100644
--- a/app/src/main/java/net/jeena/jtubetv/ui/screens/list/VideoListScreen.kt
+++ b/app/src/main/java/net/jeena/jtubetv/ui/screens/list/VideoListScreen.kt
@@ -51,7 +51,6 @@ fun VideoListScreen(
     restoreToken: Int = 0,
     epoch: Int = 0,
     onOpenDrawer: () -> Unit = {},
-    upToTopBar: (() -> Unit)? = null,
     viewModel: VideoListViewModel = viewModel(
         key = "v$epoch:" + sourceKey(source),
         factory = VideoListViewModel.factory(source),
@@ -169,7 +168,6 @@ fun VideoListScreen(
                 showPrivacy = source is ListSource.MyVideos,
                 compact = true,
                 onLeftAtStart = if (index % cardsPerRow == 0) onOpenDrawer else null,
-                onUpToTopBar = upToTopBar?.takeIf { index < 4 },
                 modifier = Modifier
                     .focusRequester(fr),
             )