diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 2bc2e0552..fd856ea00 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -234,6 +234,7 @@ model Video {
   url          String
   published_at DateTime
   thumbnail    String
+  duration     String            @default("00:00")
   slug         String            @unique
   playlists    PlaylistOnVideo[]
   shows        ShowVideo[]
diff --git a/src/lib/videos/PlaylistVideo.svelte b/src/lib/videos/PlaylistVideo.svelte
index 88b31a504..5edb0e54b 100644
--- a/src/lib/videos/PlaylistVideo.svelte
+++ b/src/lib/videos/PlaylistVideo.svelte
@@ -7,7 +7,12 @@
 
 <div>
 	<a href={`/videos/${playlist.slug}/${video.slug}`}>
-		<img src={video.thumbnail} class="thumbnail" alt={video.title} />
+		<div class="thumbnail-wrapper">
+			<img src={video.thumbnail} class="thumbnail" alt={video.title} />
+			{#if video.duration}
+				<span class="duration">{video.duration}</span>
+			{/if}
+		</div>
 		<h3 class="h6">{video.title}</h3>
 	</a>
 </div>
@@ -23,9 +28,25 @@
 		margin-top: 0;
 	}
 
-	.thumbnail {
-		overflow: hidden;
-		border-radius: var(--brad);
+	
+	.thumbnail-wrapper {
+		position: relative;
+		
+		.thumbnail {
+			overflow: hidden;
+			border-radius: var(--brad);
+		}
+		.duration {
+			position: absolute;
+			display: inline-block;
+			background: var(--yellow);
+			color: var(--black);
+			border-radius: 1rem;
+			padding: 0.25rem;
+			right: 1rem;
+			top: 1rem;
+			font-weight: 600;
+		}
 	}
 
 	img {
diff --git a/src/lib/videos/parseDuration.ts b/src/lib/videos/parseDuration.ts
new file mode 100644
index 000000000..f5aef9c68
--- /dev/null
+++ b/src/lib/videos/parseDuration.ts
@@ -0,0 +1,16 @@
+// Match one part of the duration string at a time and pad with 0
+// Avoids a complex / hard to understand regex for matching all parts at once
+function parseTime(duration: string, part: 'H' | 'M' | 'S') {
+	const match = duration.match(new RegExp(`(\\d+)${part}`));
+	return match ? match[1].padStart(1, '0') : '00';
+}
+
+// Parses duration from YouTube duration format (ISO 8601) e.g. PT1H14M28S to 01:14:28
+export default function parseDuration(duration: string) {
+	const hours = parseTime(duration, 'H');
+	const minutes = parseTime(duration, 'M');
+	const seconds = parseTime(duration, 'S');
+
+	const result = `${minutes}:${seconds}`;
+	return hours !== '00' ? `${hours}:${duration}` : result;
+}
diff --git a/src/routes/(site)/videos/[p_slug]/+page.svelte b/src/routes/(site)/videos/[p_slug]/+page.svelte
index 7aad1f098..591fd4e9f 100644
--- a/src/routes/(site)/videos/[p_slug]/+page.svelte
+++ b/src/routes/(site)/videos/[p_slug]/+page.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+	import PlaylistVideo from "$/lib/videos/PlaylistVideo.svelte";
+
 	export let data;
 	$: ({ playlist } = data);
 </script>
@@ -7,21 +9,12 @@
 	<h1 class="h3">{playlist.title}</h1>
 	<div class="playlist-grid grid">
 		{#each playlist.videos as { video }}
-			<a href={`/videos/${playlist.slug}/${video.slug}`}>
-				<img src={video.thumbnail} class="thumbnail" alt={video.title} />
-				<h3 class="h6">{video.title}</h3>
-			</a>
+			<PlaylistVideo {playlist} {video} />
 		{/each}
 	</div>
 {/if}
 
 <style lang="postcss">
-	img {
-		width: 100%;
-	}
-	.h6 {
-		margin-bottom: 0;
-	}
 	.playlist-grid {
 		display: grid;
 		grid-gap: 20px;
diff --git a/src/server/video/youtube_api.ts b/src/server/video/youtube_api.ts
index ebadf23f7..22bda9028 100644
--- a/src/server/video/youtube_api.ts
+++ b/src/server/video/youtube_api.ts
@@ -1,6 +1,8 @@
 import { YOUTUBE_CHANNEL_ID } from '$/const';
 import { prisma_client } from '$/hooks.server';
+import parseDuration from '$/lib/videos/parseDuration';
 import { YOUTUBE_API_KEY } from '$env/static/private';
+import type { Video } from '@prisma/client';
 import slug from 'speakingurl';
 
 // Youtube importer
@@ -147,7 +149,7 @@ export async function import_playlist(playlist_id: string) {
 
 	// Fetch video details using the videos endpoint
 	const videos_response = await fetch(
-		`https://www.googleapis.com/youtube/v3/videos?part=snippet,status&id=${video_ids.join(',')}&key=${process.env.YOUTUBE_API_KEY}`
+		`https://www.googleapis.com/youtube/v3/videos?part=snippet,status,contentDetails&id=${video_ids.join(',')}&key=${process.env.YOUTUBE_API_KEY}`
 	);
 	const videos_data = await videos_response.json();
 
@@ -159,24 +161,22 @@ export async function import_playlist(playlist_id: string) {
 		}
 
 		try {
+			const duration = parseDuration(item.contentDetails.duration);
+			const data: Omit<Video, 'id'> = {
+				title: item.snippet.title,
+				slug: slug(item.snippet.title),
+				description: item.snippet.description,
+				duration,
+				url: `https://www.youtube.com/watch?v=${item.id}`,
+				published_at: new Date(item.snippet.publishedAt),
+				thumbnail: item.snippet.thumbnails.maxres.url
+			};
 			const video = await prisma_client.video.upsert({
 				where: { id: item.id },
-				update: {
-					title: item.snippet.title,
-					slug: slug(item.snippet.title),
-					description: item.snippet.description,
-					url: `https://www.youtube.com/watch?v=${item.id}`,
-					published_at: new Date(item.snippet.publishedAt),
-					thumbnail: item.snippet.thumbnails.maxres.url
-				},
+				update: data,
 				create: {
 					id: item.id,
-					title: item.snippet.title,
-					slug: slug(item.snippet.title),
-					description: item.snippet.description,
-					url: `https://www.youtube.com/watch?v=${item.id}`,
-					published_at: new Date(item.snippet.publishedAt),
-					thumbnail: item.snippet.thumbnails.maxres.url
+					...data
 				}
 			});