diff --git a/src/frontend/src/routes/(needs_onboarding)/(navbar_and_footer)/reverse/[room_id]/+page.svelte b/src/frontend/src/routes/(needs_onboarding)/(navbar_and_footer)/reverse/[room_id]/+page.svelte
index b9bbbe1b..a2dc1ac4 100644
--- a/src/frontend/src/routes/(needs_onboarding)/(navbar_and_footer)/reverse/[room_id]/+page.svelte
+++ b/src/frontend/src/routes/(needs_onboarding)/(navbar_and_footer)/reverse/[room_id]/+page.svelte
@@ -2,7 +2,6 @@
 	import Host from './host.svelte';
 	import Client from './client.svelte';
 	import { page } from '$app/state';
-	import { browser } from '$app/environment';
 	import { isHost } from './utils';
 
 	let room_id = $derived(page.params.room_id ?? '');
diff --git a/src/frontend/src/routes/(needs_onboarding)/(navbar_and_footer)/upload/+page.svelte b/src/frontend/src/routes/(needs_onboarding)/(navbar_and_footer)/upload/+page.svelte
index 4d20bf87..77a7bf68 100644
--- a/src/frontend/src/routes/(needs_onboarding)/(navbar_and_footer)/upload/+page.svelte
+++ b/src/frontend/src/routes/(needs_onboarding)/(navbar_and_footer)/upload/+page.svelte
@@ -9,7 +9,6 @@
 	import { toast } from 'svelte-sonner';
 	import { dev } from '$app/environment';
 	import { markdown_to_html } from '$lib/markdown/markdown';
-	import { onMount, onDestroy } from 'svelte';
 	import { Button } from '$lib/components/ui/button';
 	import { fly, fade } from 'svelte/transition';
 
@@ -35,24 +34,12 @@
 	let detailsMarkdown = $derived(configData.data?.site_description ?? '');
 
 	// Handle physical mouse back button (X1) to return from stage 2 to stage 1
-	let _mouseBackHandler: ((e: MouseEvent) => void) | undefined;
-	onMount(() => {
-		_mouseBackHandler = (e: MouseEvent) => {
-			if (e.button === 3 && stage === 2) {
-				stage = 1;
-				e.preventDefault();
-			}
-		};
-		window.addEventListener('auxclick', _mouseBackHandler as EventListener);
-		window.addEventListener('pointerdown', _mouseBackHandler as EventListener);
-	});
-
-	onDestroy(() => {
-		if (_mouseBackHandler) {
-			window.removeEventListener('auxclick', _mouseBackHandler as EventListener);
-			window.removeEventListener('pointerdown', _mouseBackHandler as EventListener);
+	const handleMouseBack = (e: MouseEvent) => {
+		if (e.button === 3 && stage === 2) {
+			stage = 1;
+			e.preventDefault();
 		}
-	});
+	};
 
 	const handleWindowDragEnter = (e: DragEvent) => {
 		e.preventDefault();
@@ -229,6 +216,8 @@
 	ondragleave={handleWindowDragLeave}
 	ondrop={handleWindowDrop}
 	onpaste={handlePaste}
+	onauxclick={handleMouseBack}
+	onpointerdown={handleMouseBack}
 />
 
 {#snippet encryptionInfo()}