diff --git a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt
index 65e85ec74..6b8f4618d 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt
@@ -6,13 +6,13 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.navigation.fragment.findNavController
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.oxycblt.auxio.databinding.FragmentQueueBinding
 import org.oxycblt.auxio.playback.PlaybackViewModel
 
 // TODO: Make this better
-class QueueFragment : BottomSheetDialogFragment() {
+class QueueFragment : Fragment() {
     private val playbackModel: PlaybackViewModel by activityViewModels()
 
     override fun onCreateView(
@@ -22,13 +22,17 @@ class QueueFragment : BottomSheetDialogFragment() {
     ): View? {
         val binding = FragmentQueueBinding.inflate(inflater)
 
+        binding.queueToolbar.setNavigationOnClickListener {
+            findNavController().navigateUp()
+        }
+
         binding.queueViewpager.adapter = PagerAdapter()
 
         // TODO: Add option for default queue screen
-        if (playbackModel.userQueue.value!!.isEmpty()) {
-            binding.queueViewpager.setCurrentItem(1, false)
-        } else {
+        if (playbackModel.userQueue.value!!.isNotEmpty()) {
             binding.queueViewpager.setCurrentItem(0, false)
+        } else {
+            binding.queueViewpager.setCurrentItem(1, false)
         }
 
         return binding.root
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueListFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueListFragment.kt
index 3d05b0cd7..174172167 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueListFragment.kt
@@ -16,6 +16,7 @@ import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.playback.state.PlaybackMode
 import org.oxycblt.auxio.ui.applyDivider
 
+// TODO: Unify the user/next queues into a single fragment
 class QueueListFragment(private val type: Int) : Fragment() {
     private val playbackModel: PlaybackViewModel by activityViewModels()
 
diff --git a/app/src/main/res/layout/fragment_queue.xml b/app/src/main/res/layout/fragment_queue.xml
index 5ab6c8597..5d4a48e09 100644
--- a/app/src/main/res/layout/fragment_queue.xml
+++ b/app/src/main/res/layout/fragment_queue.xml
@@ -3,14 +3,29 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/queue_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/actionBarSize"
+            android:background="?android:attr/windowBackground"
+            android:theme="@style/Toolbar.Style"
+            android:clickable="true"
+            android:focusable="true"
+            app:navigationIcon="@drawable/ic_down"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:title="@string/label_queue"
+            app:titleTextAppearance="@style/TextAppearance.Toolbar.Header" />
 
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/queue_viewpager"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-    </FrameLayout>
+    </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_queue_list.xml b/app/src/main/res/layout/fragment_queue_list.xml
index 52e8f39f5..3070cfe12 100644
--- a/app/src/main/res/layout/fragment_queue_list.xml
+++ b/app/src/main/res/layout/fragment_queue_list.xml
@@ -7,23 +7,23 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:background="@color/background">
+        android:background="@color/background"
+        android:animateLayoutChanges="true">
 
         <TextView
             android:id="@+id/queue_header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ellipsize="marquee"
-            android:fontFamily="@font/inter_black"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:padding="@dimen/padding_medium"
-            android:singleLine="true"
-            android:text="@string/label_queue"
-            android:textColor="?android:attr/colorPrimary"
-            android:textAppearance="@style/TextAppearance.Toolbar.Header"
-            app:layout_constraintEnd_toStartOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:background="@drawable/ui_header_dividers"
+            android:fontFamily="@font/inter_bold"
+            android:paddingStart="@dimen/padding_medium"
+            android:paddingTop="@dimen/padding_small"
+            android:paddingEnd="@dimen/padding_small"
+            android:paddingBottom="@dimen/padding_small"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
+            android:textSize="16sp"
+            tools:text="Next in Queue"
+            app:layout_constraintTop_toBottomOf="@+id/album_details" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/queue_recycler"
@@ -44,6 +44,5 @@
             android:textAlignment="center"
             android:visibility="gone" />
 
-
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_main.xml b/app/src/main/res/navigation/nav_main.xml
index 6a3b633ec..838653968 100644
--- a/app/src/main/res/navigation/nav_main.xml
+++ b/app/src/main/res/navigation/nav_main.xml
@@ -124,7 +124,7 @@
             app:popEnterAnim="@anim/anim_stationary"
             app:popExitAnim="@anim/anim_nav_slide_down" />
     </fragment>
-    <dialog
+    <fragment
         android:id="@+id/queue_fragment"
         android:name="org.oxycblt.auxio.playback.queue.QueueFragment"
         android:label="QueueFragment"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a56ef79c..58c4d2086 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,7 +31,7 @@
     <string name="label_queue_add">Add to queue</string>
     <string name="label_queue_added">Added to queue</string>
     <string name="label_next_user_queue">Next in Queue</string>
-    <string name="label_empty_queue">Nothing here.</string>
+    <string name="label_empty_queue">Nothing here</string>
     <string name="label_notification_playback">Music Playback</string>
     <string name="label_service_playback">The music playback service for Auxio.</string>