diff --git a/.changeset/few-comics-hear.md b/.changeset/few-comics-hear.md
new file mode 100644
index 0000000..9ac5bb3
--- /dev/null
+++ b/.changeset/few-comics-hear.md
@@ -0,0 +1,5 @@
+---
+'intrepid-ibex': minor
+---
+
+refactor routing to use a controller
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index b3e14c7..6a2781f 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,5 +1,3 @@
-<!-- FIXME: this is becoming a "god" component, not an orchestrator
-            like it should -->
 <script lang="ts">
 	import { onMount } from 'svelte';
 	import { dev } from '$app/environment';
@@ -238,6 +236,12 @@
 		windowManager.close('eog');
 	}
 
+	function closeMainWindow() {
+		if (page.route.id === '/browse' || page.route.id?.startsWith('/repos')) {
+			void goto(resolve('/'), { keepFocus: true, noScroll: true });
+		}
+	}
+
 	function navigate(path: string) {
 		void navigateTo(resolve(path as RepoPathname), { keepFocus: true, noScroll: true });
 	}
@@ -291,7 +295,8 @@
 							maximized={mainWindow.isMaximized}
 							onfocus={() => windowManager.focus('main')}
 							onminimize={() => windowManager.minimize('main')}
-							onmaximize={() => windowManager.toggleMaximize('main')}>
+							onmaximize={() => windowManager.toggleMaximize('main')}
+							onclose={closeMainWindow}>
 							{#if routeRequiresSetup}
 								<SetupDialog />
 							{:else}