diff --git a/frontend/src/lib/components/Navbar.svelte b/frontend/src/lib/components/Navbar.svelte
index ae5eb72..7d64eb7 100644
--- a/frontend/src/lib/components/Navbar.svelte
+++ b/frontend/src/lib/components/Navbar.svelte
@@ -20,6 +20,8 @@
 	import { onMount } from 'svelte';
 	let inputElement: HTMLInputElement | null = null;
 
+	let theme = '';
+
 	// Event listener for focusing input
 	function handleKeydown(event: KeyboardEvent) {
 		// Ignore any keypresses in an input/textarea field, so we don't interfere with typing.
@@ -38,6 +40,8 @@
 		// Attach event listener on component mount
 		document.addEventListener('keydown', handleKeydown);
 
+		theme = document.documentElement.getAttribute('data-theme');
+
 		// Cleanup event listener on component destruction
 		return () => {
 			document.removeEventListener('keydown', handleKeydown);
@@ -69,9 +73,14 @@
 		locale.set(newLocale);
 		window.location.reload();
 	};
+	const submitThemeChange = (event: Event) => {
+		const theme = event.target.value;
+		const themeForm = event.target.parentNode;
+		themeForm.action = `/?/setTheme&theme=${theme}`;
+		themeForm.submit();
+	};
 	const submitUpdateTheme: SubmitFunction = ({ action }) => {
 		const theme = action.searchParams.get('theme');
-		console.log('theme', theme);
 		if (theme) {
 			document.documentElement.setAttribute('data-theme', theme);
 		}
@@ -303,13 +312,15 @@
 				</form>
 				<p class="font-bold m-4 text-lg text-center">{$t('navbar.theme_selection')}</p>
 				<form method="POST" use:enhance={submitUpdateTheme}>
-					{#each themes as theme}
-						<li>
-							<button formaction="/?/setTheme&theme={theme.name}"
-								>{$t(`navbar.themes.${theme.name}`)}
-							</button>
-						</li>
-					{/each}
+					<select
+						class="select select-bordered w-full max-w-xs bg-base-100 text-base-content"
+						bind:value={theme}
+						on:change={submitThemeChange}
+					>
+						{#each themes as theme}
+							<option value={theme.name} class="text-base-content">{$t(`navbar.themes.${theme.name}`)}</option>
+						{/each}
+					</select>
 				</form>
 			</ul>
 		</div>