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 69dafd1..97aa411 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
@@ -153,6 +153,7 @@ 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) }
@@ -188,6 +189,7 @@ fun HomeRowsScreen(
                     onLeftAtStart = onOpenDrawer,
                     clickedIndex = continueRestore,
                     restoreToken = restoreToken,
+                    upToTopBar = upToTopBar,
                 )
             }
         }
@@ -257,6 +259,7 @@ 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
     afterItem: @Composable (index: Int, video: VideoDto) -> Unit = { _, _ -> },
 ) {
     val rowState = rememberLazyListState()
@@ -315,6 +318,7 @@ 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 a9d790b..5a66d6c 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
@@ -154,6 +154,7 @@ fun HomeScreen(viewModel: AppViewModel = androidx.lifecycle.viewmodel.compose.vi
                             restoreToken = restoreToken,
                             epoch = epoch,
                             onOpenDrawer = { drawerOpen = true },
+                            upToTopBar = { runCatching { searchFocus.requestFocus() } },
                         )
                     Destination.MyVideos ->
                         VideoListScreen(
@@ -162,6 +163,7 @@ fun HomeScreen(viewModel: AppViewModel = androidx.lifecycle.viewmodel.compose.vi
                             restoreToken = restoreToken,
                             epoch = epoch,
                             onOpenDrawer = { drawerOpen = true },
+                            upToTopBar = { runCatching { searchFocus.requestFocus() } },
                         )
                     Destination.Channels -> ChannelsScreen(
                         onOpenChannel = { handle -> channelDetails = handle },
@@ -175,6 +177,7 @@ fun HomeScreen(viewModel: AppViewModel = androidx.lifecycle.viewmodel.compose.vi
                             restoreToken = restoreToken,
                             epoch = epoch,
                             onOpenDrawer = { drawerOpen = true },
+                            upToTopBar = { runCatching { searchFocus.requestFocus() } },
                         )
                     Destination.Subscriptions ->
                         SubscriptionRowsScreen(
@@ -182,6 +185,7 @@ fun HomeScreen(viewModel: AppViewModel = androidx.lifecycle.viewmodel.compose.vi
                             restoreToken = restoreToken,
                             epoch = epoch,
                             onOpenDrawer = { drawerOpen = true },
+                            upToTopBar = { runCatching { searchFocus.requestFocus() } },
                         )
                     Destination.History ->
                         VideoListScreen(
@@ -190,6 +194,7 @@ fun HomeScreen(viewModel: AppViewModel = androidx.lifecycle.viewmodel.compose.vi
                             restoreToken = restoreToken,
                             epoch = epoch,
                             onOpenDrawer = { drawerOpen = true },
+                            upToTopBar = { runCatching { searchFocus.requestFocus() } },
                         )
                 }
             }
diff --git a/app/src/main/java/net/jeena/jtubetv/ui/screens/SubscriptionsScreen.kt b/app/src/main/java/net/jeena/jtubetv/ui/screens/SubscriptionsScreen.kt
index 3a73e01..d6e7eff 100644
--- a/app/src/main/java/net/jeena/jtubetv/ui/screens/SubscriptionsScreen.kt
+++ b/app/src/main/java/net/jeena/jtubetv/ui/screens/SubscriptionsScreen.kt
@@ -82,6 +82,7 @@ fun SubscriptionRowsScreen(
     restoreToken: Int = 0,
     epoch: Int = 0,
     onOpenDrawer: () -> Unit = {},
+    upToTopBar: (() -> Unit)? = null,
     viewModel: SubscriptionRowsViewModel = viewModel(
         key = "subsrows$epoch",
         factory = object : ViewModelProvider.Factory {
@@ -157,6 +158,7 @@ fun SubscriptionRowsScreen(
                     progressOf = { null },
                     onOpenVideo = onOpenVideo,
                     onLeftAtStart = onOpenDrawer,
+                    upToTopBar = upToTopBar.takeIf { group == groups.firstOrNull() },
                 ) { rowIndex, _ ->
                     if (group.startIndex + rowIndex >= items.size - PagedListViewModel.LOOKAHEAD) {
                         viewModel.loadMore()
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 4adffc4..3d4a240 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
@@ -59,6 +59,8 @@ fun VideoCard(
     compact: Boolean = false,
     /** 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,
 ) {
@@ -72,12 +74,17 @@ fun VideoCard(
                 if (it.isFocused) onFocused?.invoke()
             }
             .onPreviewKeyEvent { ke ->
-                if (ke.type == androidx.compose.ui.input.key.KeyEventType.KeyDown &&
-                    ke.key == androidx.compose.ui.input.key.Key.DirectionLeft &&
-                    onLeftAtStart != null
-                ) {
-                    onLeftAtStart()
-                    true
+                val direction = ke.key
+                if (ke.type == androidx.compose.ui.input.key.KeyEventType.KeyDown) {
+                    when {
+                        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
             },
         colors = CardDefaults.colors(
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 0113c92..02e43b3 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
@@ -45,6 +45,7 @@ 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),
@@ -140,6 +141,7 @@ fun VideoListScreen(
                 showPrivacy = source is ListSource.MyVideos,
                 compact = true,
                 onLeftAtStart = if (index == 0) onOpenDrawer else null,
+                onUpToTopBar = upToTopBar?.takeIf { index < 4 },
                 modifier = Modifier
                     .focusRequester(fr),
             )