diff --git a/app/src/main/java/com/github/libretube/ui/fragments/BookmarksFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/BookmarksFragment.kt
deleted file mode 100644
index abd456dee..000000000
--- a/app/src/main/java/com/github/libretube/ui/fragments/BookmarksFragment.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.github.libretube.ui.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.github.libretube.databinding.FragmentBookmarksBinding
-import com.github.libretube.db.DatabaseHolder.Companion.Database
-import com.github.libretube.extensions.awaitQuery
-import com.github.libretube.ui.adapters.PlaylistBookmarkAdapter
-import com.github.libretube.ui.base.BaseFragment
-
-class BookmarksFragment : BaseFragment() {
-    private lateinit var binding: FragmentBookmarksBinding
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentBookmarksBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val bookmarks = awaitQuery {
-            Database.playlistBookmarkDao().getAll()
-        }
-
-        if (bookmarks.isEmpty()) return
-
-        binding.bookmarksRV.layoutManager = LinearLayoutManager(context)
-        binding.bookmarksRV.adapter = PlaylistBookmarkAdapter(bookmarks)
-
-        binding.bookmarksRV.visibility = View.VISIBLE
-        binding.emptyBookmarks.visibility = View.GONE
-    }
-}
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt
index 98df8c913..4dad21d5a 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt
@@ -24,7 +24,6 @@ import com.github.libretube.ui.adapters.VideosAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.extensions.withMaxSize
 import com.github.libretube.util.LocaleHelper
-import com.github.libretube.util.PreferenceHelper
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -57,7 +56,7 @@ class HomeFragment : BaseFragment() {
         }
 
         binding.bookmarksTV.setOnClickListener {
-            findNavController().navigate(R.id.bookmarksFragment)
+            findNavController().navigate(R.id.libraryFragment)
         }
 
         binding.refresh.setOnRefreshListener {
@@ -73,7 +72,6 @@ class HomeFragment : BaseFragment() {
     }
 
     private suspend fun fetchHome() {
-        val token = PreferenceHelper.getToken()
         runOrError {
             val feed = SubscriptionHelper.getFeed().withMaxSize(20)
             if (feed.isEmpty()) return@runOrError
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt
index 62c78c4f9..1c26b5f85 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt
@@ -15,8 +15,11 @@ import com.github.libretube.R
 import com.github.libretube.api.PlaylistsHelper
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.FragmentLibraryBinding
+import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.extensions.TAG
+import com.github.libretube.extensions.awaitQuery
 import com.github.libretube.extensions.toPixel
+import com.github.libretube.ui.adapters.PlaylistBookmarkAdapter
 import com.github.libretube.ui.adapters.PlaylistsAdapter
 import com.github.libretube.ui.base.BaseFragment
 import com.github.libretube.ui.dialogs.CreatePlaylistDialog
@@ -41,13 +44,15 @@ class LibraryFragment : BaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        // initialize the layout managers
+        binding.bookmarksRecView.layoutManager = LinearLayoutManager(context)
+        binding.playlistRecView.layoutManager = LinearLayoutManager(context)
+
         // listen for the mini player state changing
         playerViewModel.isMiniPlayerVisible.observe(viewLifecycleOwner) {
             updateFABMargin(it)
         }
 
-        binding.playlistRecView.layoutManager = LinearLayoutManager(requireContext())
-
         // hide watch history button of history disabled
         val watchHistoryEnabled =
             PreferenceHelper.getBoolean(PreferenceKeys.WATCH_HISTORY_TOGGLE, true)
@@ -59,10 +64,6 @@ class LibraryFragment : BaseFragment() {
             }
         }
 
-        binding.bookmarks.setOnClickListener {
-            findNavController().navigate(R.id.bookmarksFragment)
-        }
-
         binding.downloads.setOnClickListener {
             findNavController().navigate(R.id.downloadsFragment)
         }
@@ -73,10 +74,12 @@ class LibraryFragment : BaseFragment() {
         }
 
         fetchPlaylists()
+        initBookmarks()
 
         binding.playlistRefresh.isEnabled = true
         binding.playlistRefresh.setOnRefreshListener {
             fetchPlaylists()
+            initBookmarks()
         }
         binding.createPlaylist.setOnClickListener {
             CreatePlaylistDialog {
@@ -85,6 +88,17 @@ class LibraryFragment : BaseFragment() {
         }
     }
 
+    private fun initBookmarks() {
+        val bookmarks = awaitQuery {
+            DatabaseHolder.Database.playlistBookmarkDao().getAll()
+        }
+
+        binding.bookmarksCV.visibility = if (bookmarks.isEmpty()) View.GONE else View.VISIBLE
+        if (bookmarks.isEmpty()) return
+
+        binding.bookmarksRecView.adapter = PlaylistBookmarkAdapter(bookmarks)
+    }
+
     private fun updateFABMargin(isMiniPlayerVisible: Boolean) {
         // optimize CreatePlaylistFab bottom margin if miniPlayer active
         val bottomMargin = if (isMiniPlayerVisible) 64 else 16
diff --git a/app/src/main/res/layout/fragment_bookmarks.xml b/app/src/main/res/layout/fragment_bookmarks.xml
deleted file mode 100644
index f874db5dd..000000000
--- a/app/src/main/res/layout/fragment_bookmarks.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:id="@+id/emptyBookmarks"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:orientation="vertical">
-
-        <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:layout_gravity="center"
-            android:src="@drawable/ic_bookmark_outlined" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="16dp"
-            android:text="@string/bookmarks_empty"
-            android:textSize="20sp"
-            android:textStyle="bold" />
-
-    </LinearLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/bookmarksRV"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 114bb3e0e..112e96d9b 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -12,128 +12,147 @@
         android:layout_height="match_parent"
         android:layout_margin="10dp">
 
-        <LinearLayout
+        <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="vertical" >
 
-            <com.google.android.material.card.MaterialCardView
-                style="@style/Widget.Material3.CardView.Elevated"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
-                <LinearLayout
+                <com.google.android.material.card.MaterialCardView
+                    style="@style/Widget.Material3.CardView.Elevated"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:layout_height="wrap_content">
 
-                    <TextView
-                        android:id="@+id/watch_history"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackground"
-                        android:drawablePadding="10dp"
-                        android:paddingHorizontal="15dp"
-                        android:paddingVertical="12dp"
-                        android:text="@string/watch_history"
-                        android:textSize="18sp"
-                        android:textStyle="bold"
-                        app:drawableStartCompat="@drawable/ic_time_outlined" />
-
-                    <TextView
-                        android:id="@+id/bookmarks"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackground"
-                        android:drawablePadding="10dp"
-                        android:paddingHorizontal="15dp"
-                        android:paddingVertical="12dp"
-                        android:text="@string/bookmarks"
-                        android:textSize="18sp"
-                        android:textStyle="bold"
-                        app:drawableStartCompat="@drawable/ic_bookmark_outlined" />
-
-                    <TextView
-                        android:id="@+id/downloads"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackground"
-                        android:drawablePadding="10dp"
-                        android:paddingHorizontal="15dp"
-                        android:paddingVertical="12dp"
-                        android:text="@string/downloads"
-                        android:textSize="18sp"
-                        android:textStyle="bold"
-                        app:drawableStartCompat="@drawable/ic_download" />
-
-                </LinearLayout>
-
-            </com.google.android.material.card.MaterialCardView>
-
-            <com.google.android.material.card.MaterialCardView
-                style="@style/Widget.Material3.CardView.Elevated"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginBottom="10dp"
-                android:layout_weight="1">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:padding="10dp">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/playlists"
-                        android:textSize="18sp"
-                        android:textStyle="bold" />
-
-                    <RelativeLayout
-                        android:id="@+id/nothing_here"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:visibility="gone">
-
-                        <ImageView
-                            android:id="@+id/listIV"
-                            android:layout_width="100dp"
-                            android:layout_height="100dp"
-                            android:layout_centerInParent="true"
-                            android:src="@drawable/ic_list" />
+                        android:orientation="vertical">
 
                         <TextView
-                            android:id="@+id/text_like"
-                            android:layout_width="wrap_content"
+                            android:id="@+id/watch_history"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_below="@id/listIV"
-                            android:layout_centerHorizontal="true"
-                            android:gravity="center"
-                            android:text="@string/emptyList"
-                            android:textSize="20sp"
-                            android:textStyle="bold" />
-                    </RelativeLayout>
+                            android:background="?attr/selectableItemBackground"
+                            android:drawablePadding="10dp"
+                            android:paddingHorizontal="15dp"
+                            android:paddingVertical="12dp"
+                            android:text="@string/watch_history"
+                            android:textSize="18sp"
+                            android:textStyle="bold"
+                            app:drawableStartCompat="@drawable/ic_time_outlined" />
 
-                    <RelativeLayout
+                        <TextView
+                            android:id="@+id/downloads"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:background="?attr/selectableItemBackground"
+                            android:drawablePadding="10dp"
+                            android:paddingHorizontal="15dp"
+                            android:paddingVertical="12dp"
+                            android:text="@string/downloads"
+                            android:textSize="18sp"
+                            android:textStyle="bold"
+                            app:drawableStartCompat="@drawable/ic_download" />
+
+                    </LinearLayout>
+
+                </com.google.android.material.card.MaterialCardView>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="@style/Widget.Material3.CardView.Elevated"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginBottom="10dp"
+                    android:layout_weight="1">
+
+                    <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginTop="10dp"
-                        android:descendantFocusability="blocksDescendants">
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:padding="10dp">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/playlists"
+                            android:padding="8dp"
+                            android:textSize="18sp"
+                            android:textStyle="bold" />
+
+                        <RelativeLayout
+                            android:id="@+id/nothing_here"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:visibility="gone">
+
+                            <ImageView
+                                android:id="@+id/listIV"
+                                android:layout_width="100dp"
+                                android:layout_height="100dp"
+                                android:layout_centerInParent="true"
+                                android:src="@drawable/ic_list" />
+
+                            <TextView
+                                android:id="@+id/text_like"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_below="@id/listIV"
+                                android:layout_centerHorizontal="true"
+                                android:gravity="center"
+                                android:text="@string/emptyList"
+                                android:textSize="20sp"
+                                android:textStyle="bold" />
+                        </RelativeLayout>
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/playlist_recView"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:nestedScrollingEnabled="false" />
+                            android:layout_height="wrap_content" />
 
-                    </RelativeLayout>
+                    </LinearLayout>
 
-                </LinearLayout>
+                </com.google.android.material.card.MaterialCardView>
 
-            </com.google.android.material.card.MaterialCardView>
-        </LinearLayout>
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/bookmarksCV"
+                    style="@style/Widget.Material3.CardView.Elevated"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:layout_weight="1"
+                    android:visibility="gone">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:padding="10dp">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/bookmarks"
+                            android:textSize="18sp"
+                            android:padding="8dp"
+                            android:textStyle="bold" />
+
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/bookmarks_recView"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+
+                    </LinearLayout>
+
+                </com.google.android.material.card.MaterialCardView>
+            </LinearLayout>
+
+        </ScrollView>
     </com.github.libretube.ui.views.CustomSwipeToRefresh>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/app/src/main/res/navigation/nav.xml b/app/src/main/res/navigation/nav.xml
index 748de8cdf..d076b0d5a 100644
--- a/app/src/main/res/navigation/nav.xml
+++ b/app/src/main/res/navigation/nav.xml
@@ -54,9 +54,4 @@
         android:name="com.github.libretube.ui.fragments.DownloadsFragment"
         android:label="@string/downloads"
         tools:layout="@layout/fragment_downloads" />
-    <fragment
-        android:id="@+id/bookmarksFragment"
-        android:name="com.github.libretube.ui.fragments.BookmarksFragment"
-        android:label="@string/bookmarks"
-        tools:layout="@layout/fragment_bookmarks" />
 </navigation>
\ No newline at end of file