diff --git a/src/lib/components/ui/LocationPicker.svelte b/src/lib/components/ui/LocationPicker.svelte
new file mode 100644
index 0000000..6d2344e
--- /dev/null
+++ b/src/lib/components/ui/LocationPicker.svelte
@@ -0,0 +1,71 @@
+<script lang="ts">
+	interface Location {
+		id: string;
+		name: string;
+		parentId: string | null;
+	}
+
+	interface Props {
+		locations: Location[];
+		value?: string | null;
+		name?: string;
+		id?: string;
+	}
+
+	let { locations, value = $bindable(null), name = 'locationId', id = 'locationId' }: Props = $props();
+
+	const parents = $derived(locations.filter((l) => !l.parentId));
+	const childrenOf = $derived((parentId: string) => locations.filter((l) => l.parentId === parentId));
+
+	// Find current parent from value
+	const selectedLoc = $derived(locations.find((l) => l.id === value));
+	let selectedParent = $state<string>('');
+
+	// Init selectedParent from current value
+	$effect(() => {
+		if (selectedLoc) {
+			selectedParent = selectedLoc.parentId ?? selectedLoc.id;
+		}
+	});
+
+	const children = $derived(selectedParent ? childrenOf(selectedParent) : []);
+	const parentIsLeaf = $derived(selectedParent ? childrenOf(selectedParent).length === 0 : false);
+
+	// When parent changes, auto-select it if it has no children
+	$effect(() => {
+		if (selectedParent && parentIsLeaf) {
+			value = selectedParent;
+		} else if (selectedParent && children.length > 0 && !children.find((c) => c.id === value)) {
+			value = null;
+		}
+	});
+</script>
+
+<div class="space-y-2">
+	<select
+		onchange={(e) => {
+			selectedParent = (e.target as HTMLSelectElement).value;
+			value = null;
+		}}
+		class="w-full rounded-md border border-gray-300 px-3 py-2 text-sm dark:border-gray-600 dark:bg-gray-700 dark:text-white"
+	>
+		<option value="">No location</option>
+		{#each parents as loc}
+			<option value={loc.id} selected={loc.id === selectedParent}>{loc.name}</option>
+		{/each}
+	</select>
+
+	{#if selectedParent && children.length > 0}
+		<select
+			onchange={(e) => { value = (e.target as HTMLSelectElement).value || selectedParent; }}
+			class="w-full rounded-md border border-gray-300 px-3 py-2 text-sm dark:border-gray-600 dark:bg-gray-700 dark:text-white"
+		>
+			<option value="" selected={value === selectedParent}>{parents.find(p => p.id === selectedParent)?.name} (general)</option>
+			{#each children as child}
+				<option value={child.id} selected={child.id === value}>{child.name}</option>
+			{/each}
+		</select>
+	{/if}
+
+	<input type="hidden" {name} {id} value={value ?? ''} />
+</div>
diff --git a/src/routes/(app)/components/[id]/edit/+page.server.ts b/src/routes/(app)/components/[id]/edit/+page.server.ts
index 1d0e9fc..51a6d8d 100644
--- a/src/routes/(app)/components/[id]/edit/+page.server.ts
+++ b/src/routes/(app)/components/[id]/edit/+page.server.ts
@@ -22,7 +22,7 @@ export const load: PageServerLoad = async ({ params }) => {
 	const [component] = await db.select().from(components).where(eq(components.id, params.id));
 	if (!component) error(404, 'Component not found');
 
-	const locationList = await db.select({ id: locations.id, name: locations.name }).from(locations);
+	const locationList = await db.select({ id: locations.id, name: locations.name, parentId: locations.parentId }).from(locations).orderBy(locations.name);
 
 	return { component, locations: locationList };
 };
diff --git a/src/routes/(app)/components/[id]/edit/+page.svelte b/src/routes/(app)/components/[id]/edit/+page.svelte
index c4b53c5..aecebdc 100644
--- a/src/routes/(app)/components/[id]/edit/+page.svelte
+++ b/src/routes/(app)/components/[id]/edit/+page.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { enhance } from '$app/forms';
 	import { COMPONENT_TYPES, COMPONENT_CONDITIONS } from '$lib/constants.js';
+	import LocationPicker from '$lib/components/ui/LocationPicker.svelte';
 
 	let { data, form } = $props();
 	const c = $derived(data.component);
@@ -88,13 +89,7 @@
 		{#if !c.currentDeviceId}
 			<div class="rounded-lg border border-gray-200 bg-white p-5 dark:border-gray-700 dark:bg-gray-800">
 				<h2 class="mb-4 text-sm font-semibold uppercase tracking-wider text-gray-400 dark:text-gray-500">Storage Location</h2>
-				<select id="locationId" name="locationId"
-					class="w-full rounded-md border border-gray-300 px-3 py-2 text-sm dark:border-gray-600 dark:bg-gray-700 dark:text-white">
-					<option value="">No location</option>
-					{#each data.locations as loc}
-						<option value={loc.id} selected={loc.id === (form?.values?.locationId ?? c.locationId)}>{loc.name}</option>
-					{/each}
-				</select>
+				<LocationPicker locations={data.locations} value={c.locationId} name="locationId" />
 			</div>
 		{/if}
 
diff --git a/src/routes/(app)/components/new/+page.server.ts b/src/routes/(app)/components/new/+page.server.ts
index a788500..644723e 100644
--- a/src/routes/(app)/components/new/+page.server.ts
+++ b/src/routes/(app)/components/new/+page.server.ts
@@ -26,8 +26,9 @@ export const load: PageServerLoad = async () => {
 		.where(eq(devices.disabled, false))
 		.orderBy(devices.title);
 	const locationList = await db
-		.select({ id: locations.id, name: locations.name })
-		.from(locations);
+		.select({ id: locations.id, name: locations.name, parentId: locations.parentId })
+		.from(locations)
+		.orderBy(locations.name);
 	return { devices: deviceList, locations: locationList };
 };
 
diff --git a/src/routes/(app)/components/new/+page.svelte b/src/routes/(app)/components/new/+page.svelte
index f3ab329..300474b 100644
--- a/src/routes/(app)/components/new/+page.svelte
+++ b/src/routes/(app)/components/new/+page.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { enhance } from '$app/forms';
 	import { COMPONENT_TYPES, COMPONENT_CONDITIONS } from '$lib/constants.js';
+	import LocationPicker from '$lib/components/ui/LocationPicker.svelte';
 
 	let { data, form } = $props();
 </script>
@@ -99,14 +100,8 @@
 				</select>
 			</div>
 			<div>
-				<label for="locationId" class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">Storage Location</label>
-				<select id="locationId" name="locationId"
-					class="w-full rounded-md border border-gray-300 px-3 py-2 text-sm dark:border-gray-600 dark:bg-gray-700 dark:text-white">
-					<option value="">No location</option>
-					{#each data.locations as loc}
-						<option value={loc.id}>{loc.name}</option>
-					{/each}
-				</select>
+				<span class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">Storage Location</span>
+				<LocationPicker locations={data.locations} name="locationId" />
 			</div>
 		</div>
 
diff --git a/src/routes/(app)/devices/[id]/edit/+page.server.ts b/src/routes/(app)/devices/[id]/edit/+page.server.ts
index 984e93e..082a0df 100644
--- a/src/routes/(app)/devices/[id]/edit/+page.server.ts
+++ b/src/routes/(app)/devices/[id]/edit/+page.server.ts
@@ -35,7 +35,7 @@ export const load: PageServerLoad = async ({ params }) => {
 		compDetails = cd ?? null;
 	}
 
-	const locationList = await db.select({ id: locations.id, name: locations.name }).from(locations);
+	const locationList = await db.select({ id: locations.id, name: locations.name, parentId: locations.parentId }).from(locations).orderBy(locations.name);
 
 	return { device, computerDetails: compDetails, locations: locationList };
 };
diff --git a/src/routes/(app)/devices/[id]/edit/+page.svelte b/src/routes/(app)/devices/[id]/edit/+page.svelte
index 20d8668..61bd095 100644
--- a/src/routes/(app)/devices/[id]/edit/+page.svelte
+++ b/src/routes/(app)/devices/[id]/edit/+page.svelte
@@ -2,6 +2,7 @@
 	import { enhance } from '$app/forms';
 	import { DEVICE_CATEGORIES, DEVICE_CONDITIONS, VOLTAGE_OPTIONS, FREQUENCY_OPTIONS } from '$lib/constants.js';
 	import AutocompleteInput from '$lib/components/ui/AutocompleteInput.svelte';
+	import LocationPicker from '$lib/components/ui/LocationPicker.svelte';
 
 	let { data, form } = $props();
 
@@ -157,14 +158,8 @@
 		<div class="rounded-lg border border-gray-200 bg-white p-5 dark:border-gray-700 dark:bg-gray-800">
 			<h2 class="mb-4 text-sm font-semibold uppercase tracking-wider text-gray-400 dark:text-gray-500">Location & Notes</h2>
 			<div class="mb-4">
-				<label for="locationId" class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">Location</label>
-				<select id="locationId" name="locationId"
-					class="w-full rounded-md border border-gray-300 px-3 py-2 text-sm dark:border-gray-600 dark:bg-gray-700 dark:text-white">
-					<option value="">No location</option>
-					{#each data.locations as loc}
-						<option value={loc.id} selected={loc.id === (form?.values?.locationId ?? d.locationId)}>{loc.name}</option>
-					{/each}
-				</select>
+				<span class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">Location</span>
+				<LocationPicker locations={data.locations} value={d.locationId} />
 			</div>
 			<div>
 				<label for="generalNotes" class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">General Notes</label>
diff --git a/src/routes/(app)/devices/new/+page.server.ts b/src/routes/(app)/devices/new/+page.server.ts
index 733ff30..dd2cbf2 100644
--- a/src/routes/(app)/devices/new/+page.server.ts
+++ b/src/routes/(app)/devices/new/+page.server.ts
@@ -27,7 +27,7 @@ const deviceSchema = z.object({
 });
 
 export const load: PageServerLoad = async () => {
-	const locationList = await db.select({ id: locations.id, name: locations.name }).from(locations);
+	const locationList = await db.select({ id: locations.id, name: locations.name, parentId: locations.parentId }).from(locations).orderBy(locations.name);
 	return { locations: locationList };
 };
 
diff --git a/src/routes/(app)/devices/new/+page.svelte b/src/routes/(app)/devices/new/+page.svelte
index 55979bd..6586dcd 100644
--- a/src/routes/(app)/devices/new/+page.svelte
+++ b/src/routes/(app)/devices/new/+page.svelte
@@ -2,6 +2,7 @@
 	import { enhance } from '$app/forms';
 	import { DEVICE_CATEGORIES, DEVICE_CONDITIONS, VOLTAGE_OPTIONS, FREQUENCY_OPTIONS } from '$lib/constants.js';
 	import AutocompleteInput from '$lib/components/ui/AutocompleteInput.svelte';
+	import LocationPicker from '$lib/components/ui/LocationPicker.svelte';
 
 	let { data, form } = $props();
 
@@ -179,14 +180,8 @@
 			<h2 class="mb-4 text-sm font-semibold uppercase tracking-wider text-gray-400 dark:text-gray-500">Location & Notes</h2>
 
 			<div class="mb-4">
-				<label for="locationId" class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">Location</label>
-				<select id="locationId" name="locationId"
-					class="w-full rounded-md border border-gray-300 px-3 py-2 text-sm dark:border-gray-600 dark:bg-gray-700 dark:text-white">
-					<option value="">No location</option>
-					{#each data.locations as loc}
-						<option value={loc.id} selected={form?.values?.locationId === loc.id}>{loc.name}</option>
-					{/each}
-				</select>
+				<span class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">Location</span>
+				<LocationPicker locations={data.locations} />
 			</div>
 
 			<div>
diff --git a/src/routes/(app)/installations/new/+page.server.ts b/src/routes/(app)/installations/new/+page.server.ts
index bffa69a..bc3a738 100644
--- a/src/routes/(app)/installations/new/+page.server.ts
+++ b/src/routes/(app)/installations/new/+page.server.ts
@@ -32,8 +32,9 @@ export const load: PageServerLoad = async ({ url }) => {
 		.from(components)
 		.orderBy(components.title);
 	const locationList = await db
-		.select({ id: locations.id, name: locations.name })
-		.from(locations);
+		.select({ id: locations.id, name: locations.name, parentId: locations.parentId })
+		.from(locations)
+		.orderBy(locations.name);
 
 	return {
 		devices: deviceList,
diff --git a/src/routes/(app)/installations/new/+page.svelte b/src/routes/(app)/installations/new/+page.svelte
index 27763c3..9c83238 100644
--- a/src/routes/(app)/installations/new/+page.svelte
+++ b/src/routes/(app)/installations/new/+page.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { enhance } from '$app/forms';
 	import { INSTALLATION_ACTIONS } from '$lib/constants.js';
+	import LocationPicker from '$lib/components/ui/LocationPicker.svelte';
 
 	let { data, form } = $props();
 
@@ -59,14 +60,8 @@
 
 			{#if action === 'removed'}
 				<div class="mb-4">
-					<label for="storageLocationId" class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">Storage Location</label>
-					<select id="storageLocationId" name="storageLocationId"
-						class="w-full rounded-md border border-gray-300 px-3 py-2 text-sm dark:border-gray-600 dark:bg-gray-700 dark:text-white">
-						<option value="">No location</option>
-						{#each data.locations as loc}
-							<option value={loc.id}>{loc.name}</option>
-						{/each}
-					</select>
+					<span class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">Storage Location</span>
+					<LocationPicker locations={data.locations} name="storageLocationId" />
 				</div>
 			{/if}