diff --git a/packages/web/src/routes/progress/[id]/+page.server.ts b/packages/web/src/routes/progress/[id]/+page.server.ts
index cd77903..e22802f 100755
--- a/packages/web/src/routes/progress/[id]/+page.server.ts
+++ b/packages/web/src/routes/progress/[id]/+page.server.ts
@@ -1,10 +1,10 @@
-import { db } from "$lib/db"
-import { tasks, tasksToTopics } from "$lib/db/schema"
-import { eq } from "drizzle-orm"
+import { db } from '$lib/db';
+import { tasks, tasksToTopics, topics } from '$lib/db/schema';
+import { eq, and } from 'drizzle-orm';
 
 export const load = async ({ params }) => {
 	return {
-		task: (await db.query.tasks.findFirst({
+		task: await db.query.tasks.findFirst({
 			with: {
 				tasksToTopics: {
 					with: {
@@ -13,17 +13,50 @@ export const load = async ({ params }) => {
 				}
 			},
 			where: eq(tasks.id, params.id)
-
-		})
-		),
+		}),
 		topics: await db.query.topics.findMany()
-	}
-}
+	};
+};
 
 export const actions = {
-	addTopic: async ({ request, params }) => {
-		const data = await request.formData()
+	createTopic: async ({ request, params }) => {
+		const data = await request.formData();
 
-		const task = await db.insert(tasksToTopics).values({ taskId: params.id, topicId: data.get('topic-id') }).returning()
+		const topic = await db
+			.insert(topics)
+			.values({ name: data.get('name') })
+			.returning();
+
+		const existing = await db.query.tasksToTopics.findFirst({
+			where: and(
+				eq(tasksToTopics.taskId, Number(params.id)),
+				eq(tasksToTopics.topicId, topic[0].id)
+			)
+		});
+
+		if (!existing) {
+			await db
+				.insert(tasksToTopics)
+				.values({ taskId: Number(params.id), topicId: topic[0].id })
+				.returning();
+		}
+	},
+	addTopic: async ({ request, params }) => {
+		const data = await request.formData();
+
+		const topicId = Number(data.get('topic-id'));
+
+		const existing = await db.query.tasksToTopics.findFirst({
+			where: and(eq(tasksToTopics.taskId, Number(params.id)), eq(tasksToTopics.topicId, topicId))
+		});
+
+		console.log(existing);
+
+		if (!existing) {
+			await db
+				.insert(tasksToTopics)
+				.values({ taskId: Number(params.id), topicId })
+				.returning();
+		}
 	}
-}
+};
diff --git a/packages/web/src/routes/progress/[id]/+page.svelte b/packages/web/src/routes/progress/[id]/+page.svelte
index c1c7246..d0a3586 100755
--- a/packages/web/src/routes/progress/[id]/+page.svelte
+++ b/packages/web/src/routes/progress/[id]/+page.svelte
@@ -10,7 +10,9 @@
 
 	let open = $state(false);
 	let value = $state('');
+	let search = $state('');
 	let triggerRef = $state<HTMLButtonElement>(null!);
+	let addTopicForms = $state<HTMLFormElement[]>([]);
 
 	// We want to refocus the trigger button when the user selects
 	// an item from the list so users can continue navigating the
@@ -37,23 +39,39 @@
 			</Popover.Trigger>
 			<Popover.Content class="w-[200px] p-0">
 				<Command.Root>
-					<Command.Input placeholder="Search topic..." />
+					<Command.Input bind:value={search} placeholder="Search topic..." />
 					<Command.List>
-						<Command.Empty>No topic found.</Command.Empty>
+						<Command.Empty
+							>{#if search && !data.topics.filter((t) => t.name?.includes(search)).length}
+								<form method="post" action="?/createTopic">
+									<input type="hidden" name="name" value={search} />
+									<button class="px-4 py-2 rounded bg-secondary">Add Topic</button>
+								</form>
+							{:else}No topic found.
+							{/if}</Command.Empty
+						>
 						<Command.Group>
-							{#each data.topics as topic}
-								<Command.Item
-									value={topic.id.toString()}
-									onSelect={() => {
-										value = topic.id.toString();
-										closeAndFocusTrigger();
-									}}
+							{#each data.topics.filter((t) => !search || t.name?.includes(search)) as topic}
+								<form
+									action="?/addTopic"
+									method="post"
+									bind:this={addTopicForms[topic.id]}
+									onsubmit={() => (value = topic.id.toString())}
 								>
-									<Check
-										class={cn('mr-2 size-4', value !== topic.id.toString() && 'text-transparent')}
-									/>
-									{topic.name}
-								</Command.Item>
+									<input type="hidden" name="topic-id" value={topic.id} />
+									<Command.Item
+										value={topic.id.toString()}
+										onSelect={async () => {
+											addTopicForms[topic.id].submit();
+											closeAndFocusTrigger();
+										}}
+									>
+										<Check
+											class={cn('mr-2 size-4', value !== topic.id.toString() && 'text-transparent')}
+										/>
+										{topic.name}
+									</Command.Item>
+								</form>
 							{/each}
 						</Command.Group>
 					</Command.List>