diff --git a/src/lib/components/atoms/Button.svelte b/src/lib/components/atoms/Button.svelte
index 2684160..a60238f 100644
--- a/src/lib/components/atoms/Button.svelte
+++ b/src/lib/components/atoms/Button.svelte
@@ -7,7 +7,7 @@
 	export let unclickable = false;
 </script>
 
-<button class={type} class:unclickable on:click style="width: {maxWidth ? '100%' : 'max-content'}">
+<button class={type} class:unclickable on:click|stopPropagation style="width: {maxWidth ? '100%' : 'max-content'}">
 	{#if icon}
 		<img src={icon} {alt} />
 	{/if}
diff --git a/src/lib/components/atoms/LogoOption.svelte b/src/lib/components/atoms/LogoOption.svelte
index 032e8ff..d199a52 100644
--- a/src/lib/components/atoms/LogoOption.svelte
+++ b/src/lib/components/atoms/LogoOption.svelte
@@ -89,8 +89,8 @@
 
 <!-- SHUT UP -->
 <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
-<div class="option" tabindex="0" class:clicked>
-	<div class="row" on:click|stopPropagation={handleClick} on:keypress={handleClick}>
+<div class="option" on:click={handleClick} on:keypress={handleClick} tabindex="0" class:clicked>
+	<div class="row">
 		<!-- Screenreader compatibility does not make sense in this context. -->
 		<img src={current.optimized_direct_url ?? current.logo_direct_url} alt="" />
 	</div>