diff --git a/src/lib/components/wishlist/ClaimWishlistSection.svelte b/src/lib/components/wishlist/ClaimWishlistSection.svelte
new file mode 100644
index 0000000..00f8746
--- /dev/null
+++ b/src/lib/components/wishlist/ClaimWishlistSection.svelte
@@ -0,0 +1,55 @@
+<script lang="ts">
+	import { Button } from '$lib/components/ui/button';
+	import { enhance } from '$app/forms';
+	import { languageStore } from '$lib/stores/language.svelte';
+
+	let {
+		isAuthenticated,
+		isOwner,
+		hasClaimed
+	}: {
+		isAuthenticated: boolean;
+		isOwner: boolean;
+		hasClaimed: boolean;
+	} = $props();
+
+	const t = $derived(languageStore.t);
+</script>
+
+{#if isAuthenticated}
+	<div class="mb-6">
+		{#if isOwner}
+			<Button
+				disabled
+				variant="outline"
+				class="w-full md:w-auto opacity-60 cursor-not-allowed"
+			>
+				{t.wishlist.youOwnThis}
+			</Button>
+			<p class="text-sm text-muted-foreground mt-2">
+				{t.wishlist.alreadyInDashboard}
+			</p>
+		{:else}
+			<form
+				method="POST"
+				action={hasClaimed ? "?/unclaimWishlist" : "?/claimWishlist"}
+				use:enhance
+			>
+				<Button
+					type="submit"
+					variant={hasClaimed ? "outline" : "default"}
+					class="w-full md:w-auto"
+				>
+					{hasClaimed ? "Unclaim Wishlist" : "Claim Wishlist"}
+				</Button>
+			</form>
+			<p class="text-sm text-muted-foreground mt-2">
+				{#if hasClaimed}
+					You have claimed this wishlist. It will appear in your dashboard.
+				{:else}
+					Claim this wishlist to add it to your dashboard for easy access.
+				{/if}
+			</p>
+		{/if}
+	</div>
+{/if}
diff --git a/src/lib/components/wishlist/DangerZone.svelte b/src/lib/components/wishlist/DangerZone.svelte
new file mode 100644
index 0000000..165d057
--- /dev/null
+++ b/src/lib/components/wishlist/DangerZone.svelte
@@ -0,0 +1,46 @@
+<script lang="ts">
+	import { Button } from '$lib/components/ui/button';
+	import { enhance } from '$app/forms';
+	import UnlockButton from '$lib/components/ui/UnlockButton.svelte';
+	import { languageStore } from '$lib/stores/language.svelte';
+
+	let {
+		unlocked = $bindable()
+	}: {
+		unlocked: boolean;
+	} = $props();
+
+	const t = $derived(languageStore.t);
+</script>
+
+<div class="mt-12 pt-8 border-t border-border space-y-4">
+	<div class="flex flex-col md:flex-row gap-4 justify-between items-stretch md:items-center">
+		<UnlockButton bind:unlocked />
+
+		{#if unlocked}
+			<form
+				method="POST"
+				action="?/deleteWishlist"
+				use:enhance={({ cancel }) => {
+					if (!confirm(t.wishlist.deleteConfirm)) {
+						cancel();
+						return;
+					}
+					return async ({ result }) => {
+						if (result.type === "success") {
+							window.location.href = "/dashboard";
+						}
+					};
+				}}
+			>
+				<Button
+					type="submit"
+					variant="destructive"
+					class="w-full md:w-auto"
+				>
+					{t.wishlist.deleteWishlist}
+				</Button>
+			</form>
+		{/if}
+	</div>
+</div>
diff --git a/src/lib/utils/wishlistUpdates.ts b/src/lib/utils/wishlistUpdates.ts
new file mode 100644
index 0000000..bd0f9d2
--- /dev/null
+++ b/src/lib/utils/wishlistUpdates.ts
@@ -0,0 +1,57 @@
+/**
+ * Utility functions for updating wishlist properties
+ */
+
+type UpdateField = {
+	[key: string]: string;
+};
+
+async function updateWishlist(field: UpdateField): Promise<boolean> {
+	const response = await fetch("?/updateWishlist", {
+		method: "POST",
+		headers: {
+			"Content-Type": "application/x-www-form-urlencoded",
+		},
+		body: new URLSearchParams(field),
+	});
+
+	if (!response.ok) {
+		console.error(`Failed to update wishlist: ${Object.keys(field)[0]}`);
+		return false;
+	}
+	return true;
+}
+
+export async function updateTitle(title: string): Promise<boolean> {
+	return updateWishlist({ title });
+}
+
+export async function updateDescription(description: string | null): Promise<boolean> {
+	return updateWishlist({ description: description || "" });
+}
+
+export async function updateColor(color: string | null): Promise<boolean> {
+	return updateWishlist({ color: color || "" });
+}
+
+export async function updateEndDate(endDate: string | null): Promise<boolean> {
+	return updateWishlist({ endDate: endDate || "" });
+}
+
+export async function reorderItems(items: Array<{ id: string; order: number }>): Promise<boolean> {
+	const response = await fetch("?/reorderItems", {
+		method: "POST",
+		headers: {
+			"Content-Type": "application/x-www-form-urlencoded",
+		},
+		body: new URLSearchParams({
+			items: JSON.stringify(items),
+		}),
+	});
+
+	if (!response.ok) {
+		console.error("Failed to update item order");
+		return false;
+	}
+	return true;
+}
diff --git a/src/routes/wishlist/[token]/edit/+page.svelte b/src/routes/wishlist/[token]/edit/+page.svelte
index 227ef20..ad12704 100644
--- a/src/routes/wishlist/[token]/edit/+page.svelte
+++ b/src/routes/wishlist/[token]/edit/+page.svelte
@@ -8,17 +8,14 @@
 	import WishlistHeader from "$lib/components/wishlist/WishlistHeader.svelte";
 	import WishlistActionButtons from "$lib/components/wishlist/WishlistActionButtons.svelte";
 	import EditableItemsList from "$lib/components/wishlist/EditableItemsList.svelte";
+	import ClaimWishlistSection from "$lib/components/wishlist/ClaimWishlistSection.svelte";
+	import DangerZone from "$lib/components/wishlist/DangerZone.svelte";
 	import type { Item } from "$lib/server/schema";
-	import { Button } from "$lib/components/ui/button";
-	import { enhance } from "$app/forms";
-	import { languageStore } from '$lib/stores/language.svelte';
 	import SearchBar from "$lib/components/ui/SearchBar.svelte";
-	import UnlockButton from "$lib/components/ui/UnlockButton.svelte";
+	import * as wishlistUpdates from "$lib/utils/wishlistUpdates";
 
 	let { data }: { data: PageData } = $props();
 
-	const t = $derived(languageStore.t);
-
 	let showAddForm = $state(false);
 	let rearranging = $state(false);
 	let editingItem = $state<Item | null>(null);
@@ -76,88 +73,7 @@
 			id: item.id,
 			order: index,
 		}));
-
-		const response = await fetch("?/reorderItems", {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/x-www-form-urlencoded",
-			},
-			body: new URLSearchParams({
-				items: JSON.stringify(updates),
-			}),
-		});
-
-		if (!response.ok) {
-			console.error("Failed to update item order");
-		}
-	}
-
-	async function handleTitleUpdate(title: string): Promise<boolean> {
-		const response = await fetch("?/updateWishlist", {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/x-www-form-urlencoded",
-			},
-			body: new URLSearchParams({
-				title: title,
-			}),
-		});
-
-		if (!response.ok) {
-			console.error("Failed to update wishlist title");
-			return false;
-		}
-		return true;
-	}
-
-	async function handleDescriptionUpdate(description: string | null): Promise<boolean> {
-		const response = await fetch("?/updateWishlist", {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/x-www-form-urlencoded",
-			},
-			body: new URLSearchParams({
-				description: description || "",
-			}),
-		});
-
-		if (!response.ok) {
-			console.error("Failed to update wishlist description");
-			return false;
-		}
-		return true;
-	}
-
-	async function handleColorUpdate(color: string | null) {
-		const response = await fetch("?/updateWishlist", {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/x-www-form-urlencoded",
-			},
-			body: new URLSearchParams({
-				color: color || "",
-			}),
-		});
-
-		if (!response.ok) {
-			console.error("Failed to update wishlist color");
-		}
-	}
-
-	async function handleEndDateUpdate(endDate: string | null) {
-		const response = await fetch("?/updateWishlist", {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/x-www-form-urlencoded",
-			},
-			body: new URLSearchParams({
-				endDate: endDate || "",
-			}),
-		});
-
-		if (!response.ok) {
-			console.error("Failed to update wishlist end date");
-		}
+		await wishlistUpdates.reorderItems(updates);
 	}
 
 	function handleToggleAddForm() {
@@ -198,10 +114,10 @@
 
 	<WishlistHeader
 		wishlist={data.wishlist}
-		onTitleUpdate={handleTitleUpdate}
-		onDescriptionUpdate={handleDescriptionUpdate}
-		onColorUpdate={handleColorUpdate}
-		onEndDateUpdate={handleEndDateUpdate}
+		onTitleUpdate={wishlistUpdates.updateTitle}
+		onDescriptionUpdate={wishlistUpdates.updateDescription}
+		onColorUpdate={wishlistUpdates.updateColor}
+		onEndDateUpdate={wishlistUpdates.updateEndDate}
 	/>
 
 	<ShareLinks
@@ -209,43 +125,11 @@
 		ownerUrl="/wishlist/{data.wishlist.ownerToken}/edit"
 	/>
 
-	{#if data.isAuthenticated}
-		<div class="mb-6">
-			{#if data.isOwner}
-				<Button
-					disabled
-					variant="outline"
-					class="w-full md:w-auto opacity-60 cursor-not-allowed"
-				>
-					{t.wishlist.youOwnThis}
-				</Button>
-				<p class="text-sm text-muted-foreground mt-2">
-					{t.wishlist.alreadyInDashboard}
-				</p>
-			{:else}
-				<form
-					method="POST"
-					action={data.hasClaimed ? "?/unclaimWishlist" : "?/claimWishlist"}
-					use:enhance
-				>
-					<Button
-						type="submit"
-						variant={data.hasClaimed ? "outline" : "default"}
-						class="w-full md:w-auto"
-					>
-						{data.hasClaimed ? "Unclaim Wishlist" : "Claim Wishlist"}
-					</Button>
-				</form>
-				<p class="text-sm text-muted-foreground mt-2">
-					{#if data.hasClaimed}
-						You have claimed this wishlist. It will appear in your dashboard.
-					{:else}
-						Claim this wishlist to add it to your dashboard for easy access.
-					{/if}
-				</p>
-			{/if}
-		</div>
-	{/if}
+	<ClaimWishlistSection
+		isAuthenticated={data.isAuthenticated}
+		isOwner={data.isOwner}
+		hasClaimed={data.hasClaimed}
+	/>
 
 	<WishlistActionButtons
 		bind:rearranging={rearranging}
@@ -284,37 +168,5 @@
 		onReorder={handleReorder}
 	/>
 
-	<div class="mt-12 pt-8 border-t border-border space-y-4">
-		<div class="flex flex-col md:flex-row gap-4 justify-between items-stretch md:items-center">
-			<UnlockButton bind:unlocked={rearranging} />
-
-			{#if rearranging}
-				<form
-					method="POST"
-					action="?/deleteWishlist"
-					use:enhance={({ cancel }) => {
-						if (
-							!confirm(t.wishlist.deleteConfirm)
-						) {
-							cancel();
-							return;
-						}
-						return async ({ result }) => {
-							if (result.type === "success") {
-								window.location.href = "/dashboard";
-							}
-						};
-					}}
-				>
-					<Button
-						type="submit"
-						variant="destructive"
-						class="w-full md:w-auto"
-					>
-						{t.wishlist.deleteWishlist}
-					</Button>
-				</form>
-			{/if}
-		</div>
-	</div>
+	<DangerZone bind:unlocked={rearranging} />
 </PageContainer>