diff --git a/app/components/Player/Queue.vue b/app/components/Player/Queue.vue
new file mode 100644
index 0000000..9549c9f
--- /dev/null
+++ b/app/components/Player/Queue.vue
@@ -0,0 +1,195 @@
+<script setup lang="ts">
+const open = defineModel<boolean>("open", { default: false })
+const { queue, playAlbumAtIndex } = usePlayer()
+
+const draggedIndex = ref<number | null>(null)
+const overIndex = ref<number | null>(null)
+
+const close = () => (open.value = false)
+
+const handleKeydown = (event: KeyboardEvent) => {
+	if (event.key === "Escape") close()
+}
+
+watch(open, (isOpen) => {
+	if (isOpen) document.addEventListener("keydown", handleKeydown)
+	else document.removeEventListener("keydown", handleKeydown)
+})
+
+onBeforeUnmount(() => document.removeEventListener("keydown", handleKeydown))
+
+const startDrag = (event: DragEvent, index: number) => {
+	draggedIndex.value = index
+	if (event.dataTransfer) {
+		event.dataTransfer.effectAllowed = "move"
+		event.dataTransfer.setData("text/plain", String(index))
+	}
+}
+
+const dropAt = (event: DragEvent, index: number) => {
+	event.preventDefault()
+	const from = draggedIndex.value
+	if (from === null || from === index) return
+
+	const reordered = [...queue.value]
+	const [track] = reordered.splice(from, 1)
+	reordered.splice(index, 0, track!)
+	queue.value = reordered
+	draggedIndex.value = null
+	overIndex.value = null
+}
+
+const playAt = (index: number) => playAlbumAtIndex(queue.value, index)
+</script>
+
+<template>
+	<Teleport to="body">
+		<Transition name="queue">
+			<div v-if="open" class="queue-root" @click.self="close">
+				<div class="backdrop" @click="close"></div>
+				<aside
+					class="drawer"
+					role="dialog"
+					aria-modal="true"
+					aria-labelledby="queue-heading"
+				>
+					<header class="header">
+						<h2 id="queue-heading">Up Next</h2>
+						<button class="close" aria-label="Close queue" @click="close">
+							<Icon name="lucide:x" />
+						</button>
+					</header>
+
+					<div v-if="queue.length === 0" class="empty">
+						<p>No upcoming songs.</p>
+					</div>
+					<ol v-else class="tracks">
+						<li
+							v-for="(track, index) in queue"
+							:key="`${track._id}-${index}`"
+							:class="{ dragging: draggedIndex === index, over: overIndex === index }"
+							draggable="true"
+							@dragstart="startDrag($event, index)"
+							@dragover.prevent="overIndex = index"
+							@dragleave="overIndex = null"
+							@drop="dropAt($event, index)"
+							@dragend="draggedIndex = null; overIndex = null"
+						>
+							<TrackRow
+								:track="track"
+								:index="index"
+								show-image
+								queue-mode
+								class="queue-track"
+								@play-album-at-index="playAt(index)"
+							/>
+						</li>
+					</ol>
+				</aside>
+			</div>
+		</Transition>
+	</Teleport>
+</template>
+
+<style lang="scss" scoped>
+@use "@/styles/variables" as *;
+
+.queue-root {
+	position: fixed;
+	inset: 0;
+	z-index: 30;
+}
+
+.backdrop {
+	position: absolute;
+	inset: 0;
+	background: rgb(0 0 0 / 55%);
+}
+
+.drawer {
+	position: absolute;
+	inset-block: 0;
+	inset-inline-end: 0;
+	display: flex;
+	flex-direction: column;
+	inline-size: min(28rem, 92vw);
+	max-inline-size: 100vw;
+	background: $color-background;
+	border-inline-start: 1px solid $color-border;
+	box-shadow: 0 0 2rem rgb(0 0 0 / 30%);
+}
+
+.header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 2rem;
+	padding: 1rem 1.25rem;
+	border-bottom: 1px solid $color-border;
+
+	h2 {
+		margin: 0;
+		font-size: 1.1rem;
+	}
+}
+
+.close,
+.play {
+	border: 0;
+	color: inherit;
+	background: transparent;
+	cursor: pointer;
+}
+
+.close {
+	display: grid;
+	place-items: center;
+	font-size: 1.25rem;
+}
+
+.tracks {
+	margin: 0;
+	padding: 0.5rem;
+	list-style: none;
+	overflow-y: auto;
+}
+
+.tracks li {
+	list-style: none;
+	border-radius: $border-radius-standard;
+
+	&.over :deep(.track) {
+		background: rgb(255 255 255 / 8%);
+	}
+
+	&.dragging :deep(.track) {
+		opacity: 0.45;
+	}
+}
+
+.empty {
+	flex: 1;
+	display: grid;
+	place-items: center;
+	padding: 2rem;
+	color: rgb(255 255 255 / 55%);
+}
+
+.queue-enter-active,
+.queue-leave-active {
+	transition: opacity 0.2s ease;
+
+	.drawer {
+		transition: transform 0.2s ease;
+	}
+}
+
+.queue-enter-from,
+.queue-leave-to {
+	opacity: 0;
+
+	.drawer {
+		transform: translateX(100%);
+	}
+}
+</style>
diff --git a/app/components/Player/index.vue b/app/components/Player/index.vue
index 9b9206b..1010873 100644
--- a/app/components/Player/index.vue
+++ b/app/components/Player/index.vue
@@ -38,8 +38,8 @@ const durationFormatted = computed(() =>
 	new Date(duration.value * 1000).toISOString().slice(14, 19),
 )
 
-const toast = useToast()
 const { open: openFullscreen } = useFullscreen()
+const queueOpen = ref(false)
 </script>
 
 <template>
@@ -105,12 +105,13 @@ const { open: openFullscreen } = useFullscreen()
 				</div>
 				<Icon
 					name="lucide:list"
-					@click="toast.show('Not yet implemented')"
+					@click="queueOpen = true"
 				/>
 				<Icon name="lucide:expand" @click="openFullscreen()" />
 			</div>
 		</template>
 	</article>
+	<PlayerQueue v-model:open="queueOpen" />
 	<PlayerFullscreen />
 </template>
 
diff --git a/app/components/Track/Row.vue b/app/components/Track/Row.vue
index 090663c..39c7a3f 100644
--- a/app/components/Track/Row.vue
+++ b/app/components/Track/Row.vue
@@ -6,9 +6,11 @@ interface TrackRowProps {
 	index: number
 	extendedInfo?: boolean
 	showImage?: boolean
+	queueMode?: boolean
 }
 
-const { track, index, extendedInfo, showImage } = defineProps<TrackRowProps>()
+const { track, index, extendedInfo, showImage, queueMode } =
+	defineProps<TrackRowProps>()
 const emit = defineEmits<{ (e: "playAlbumAtIndex"): void }>()
 
 const hovering = ref(false)
@@ -56,6 +58,7 @@ const artworkSrc = computed(() => GET_FILE(track.album.file))
 			extended: extendedInfo,
 			odd: index % 2 == 1,
 			image: showImage,
+			queue: queueMode,
 		}"
 		@mouseenter="hovering = true"
 		@mouseleave="hovering = false"
@@ -92,7 +95,13 @@ const artworkSrc = computed(() => GET_FILE(track.album.file))
 
 		<p>{{ durationFormatted }}</p>
 
-		<DropdownMenu :items="dropdownMenuItems">
+		<Icon
+			v-if="queueMode"
+			name="lucide:grip-vertical"
+			class="queue-handle"
+			aria-hidden="true"
+		/>
+		<DropdownMenu v-else :items="dropdownMenuItems">
 			<Icon name="lucide:ellipsis" class="dropdown-icon" />
 		</DropdownMenu>
 	</article>
@@ -134,6 +143,10 @@ const artworkSrc = computed(() => GET_FILE(track.album.file))
 		}
 	}
 
+	&.queue {
+		cursor: grab;
+	}
+
 	p {
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -195,4 +208,9 @@ const artworkSrc = computed(() => GET_FILE(track.album.file))
 	font-size: 20px;
 	cursor: pointer;
 }
+
+.queue-handle {
+	opacity: 0.5;
+	cursor: grab;
+}
 </style>