diff --git a/website/src/lib/components/gpx-layer/GPXMapLayers.ts b/website/src/lib/components/gpx-layer/GPXMapLayers.ts
index 08c37ed1..fbd7a9c9 100644
--- a/website/src/lib/components/gpx-layer/GPXMapLayers.ts
+++ b/website/src/lib/components/gpx-layer/GPXMapLayers.ts
@@ -1,5 +1,5 @@
 import type { GPXFile } from "gpx";
-import { map, selectFiles } from "$lib/stores";
+import { map, selectFiles, currentTool, Tool } from "$lib/stores";
 import { get, type Writable } from "svelte/store";
 import type mapboxgl from "mapbox-gl";
 
@@ -122,6 +122,9 @@ export class GPXMapLayer {
     }
 
     selectOnClick(e: any) {
+        if (get(currentTool) === Tool.ROUTING) {
+            return;
+        }
         if (e.originalEvent.shiftKey) {
             get(selectFiles).addSelect(get(this.file));
         } else {
diff --git a/website/src/lib/components/toolbar/Toolbar.svelte b/website/src/lib/components/toolbar/Toolbar.svelte
index 58f59d97..61766336 100644
--- a/website/src/lib/components/toolbar/Toolbar.svelte
+++ b/website/src/lib/components/toolbar/Toolbar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { reverseSelectedFiles } from '$lib/stores';
+	import { currentTool, reverseSelectedFiles, Tool } from '$lib/stores';
 	import Routing from './routing/Routing.svelte';
 	import ToolbarItem from './ToolbarItem.svelte';
 	import {
@@ -17,14 +17,12 @@
 
 	import { _ } from 'svelte-i18n';
 
-	let currentTool: string | null = null;
-
-	function getToggleTool(tool: string) {
+	function getToggleTool(tool: Tool) {
 		return () => toggleTool(tool);
 	}
 
-	function toggleTool(tool: string) {
-		currentTool = currentTool === tool ? null : tool;
+	function toggleTool(tool: Tool) {
+		currentTool.update((current) => (current === tool ? null : tool));
 	}
 </script>
 
@@ -33,7 +31,7 @@
 		<div
 			class="h-fit flex flex-col p-1 gap-1 bg-background rounded-md pointer-events-auto shadow-md border"
 		>
-			<ToolbarItem on:click={getToggleTool('routing')}>
+			<ToolbarItem on:click={getToggleTool(Tool.ROUTING)}>
 				<Pencil slot="icon" size="18" />
 				<span slot="tooltip">{$_('toolbar.routing.tooltip')}</span>
 			</ToolbarItem>
@@ -74,7 +72,7 @@
 				<span slot="tooltip">{$_('toolbar.structure_tooltip')}</span>
 			</ToolbarItem>
 		</div>
-		{#if currentTool == 'routing'}
+		{#if $currentTool === Tool.ROUTING}
 			<Routing />
 		{/if}
 	</div>
diff --git a/website/src/lib/stores.ts b/website/src/lib/stores.ts
index c400ca0e..2d43a9d8 100644
--- a/website/src/lib/stores.ts
+++ b/website/src/lib/stores.ts
@@ -13,6 +13,10 @@ export const settings = writable<{ [key: string]: any }>({
     velocityUnits: 'speed',
     temperatureUnits: 'celsius',
 });
+export enum Tool {
+    ROUTING
+}
+export const currentTool = writable<Tool | null>(null);
 
 export function getFileStore(file: GPXFile): Writable<GPXFile> {
     return get(files).find(store => get(store) === file) ?? addFile(file);