diff --git a/application/television/src/main/java/org/videolan/television/ui/compose/composable/lists/AudioList.kt b/application/television/src/main/java/org/videolan/television/ui/compose/composable/lists/AudioList.kt
index 394ef8253..fd8eca4b5 100644
--- a/application/television/src/main/java/org/videolan/television/ui/compose/composable/lists/AudioList.kt
+++ b/application/television/src/main/java/org/videolan/television/ui/compose/composable/lists/AudioList.kt
@@ -160,18 +160,18 @@ fun AudioListScreen(onFocusExit: () -> Unit, onFocusEnter: () -> Unit, mainActiv
             modifier = Modifier.fillMaxSize()
         ) { page ->
             when (page) {
-                0 -> MediaList(MediaListEntry.ARTISTS)
-                1 -> MediaList(MediaListEntry.ALBUMS)
-                2 -> MediaList(MediaListEntry.TRACKS)
-                3 -> MediaList(MediaListEntry.GENRES)
-                4 -> MediaList(MediaListEntry.AUDIO_PLAYLISTS)
+                0 -> MediaList(MediaListEntry.ARTISTS, pagerState.currentPage)
+                1 -> MediaList(MediaListEntry.ALBUMS, pagerState.currentPage)
+                2 -> MediaList(MediaListEntry.TRACKS, pagerState.currentPage)
+                3 -> MediaList(MediaListEntry.GENRES, pagerState.currentPage)
+                4 -> MediaList(MediaListEntry.AUDIO_PLAYLISTS, pagerState.currentPage)
             }
         }
     }
 }
 
 @Composable
-fun MediaList(entry: MediaListEntry) {
+fun MediaList(entry: MediaListEntry, index: Int) {
     InvalidationComposable { invalidate ->
         val context = LocalContext.current
 
@@ -201,6 +201,7 @@ fun MediaList(entry: MediaListEntry) {
                     factory = AudioBrowserViewModel.Factory,
                     extras = extras,
                 )
+                audioBrowserViewModel.currentTab = index
                 provider = audioBrowserViewModel.getProvider(entry)
             }
         }
diff --git a/application/television/src/main/java/org/videolan/television/ui/compose/composable/lists/PlaylistsList.kt b/application/television/src/main/java/org/videolan/television/ui/compose/composable/lists/PlaylistsList.kt
index 05cf79392..1f112c392 100644
--- a/application/television/src/main/java/org/videolan/television/ui/compose/composable/lists/PlaylistsList.kt
+++ b/application/television/src/main/java/org/videolan/television/ui/compose/composable/lists/PlaylistsList.kt
@@ -47,6 +47,6 @@ fun PlaylistsList(onFocusExit: () -> Unit, onFocusEnter: () -> Unit) {
             }
         }
         .focusGroup(),) {
-        MediaList(MediaListEntry.ALL_PLAYLISTS)
+        MediaList(MediaListEntry.ALL_PLAYLISTS, -1)
     }
 }
\ No newline at end of file
diff --git a/application/television/src/main/java/org/videolan/television/ui/compose/composable/lists/VideoList.kt b/application/television/src/main/java/org/videolan/television/ui/compose/composable/lists/VideoList.kt
index 67c11893a..528217cb2 100644
--- a/application/television/src/main/java/org/videolan/television/ui/compose/composable/lists/VideoList.kt
+++ b/application/television/src/main/java/org/videolan/television/ui/compose/composable/lists/VideoList.kt
@@ -156,7 +156,7 @@ fun VideoListScreen(onFocusExit: () -> Unit, onFocusEnter: () -> Unit, mainActiv
         ) { page ->
             when (page) {
                 0 -> VideoList()
-                1 -> MediaList(MediaListEntry.VIDEO_PLAYLISTS)
+                1 -> MediaList(MediaListEntry.VIDEO_PLAYLISTS, -1)
             }
         }
     }