diff --git a/website/src/lib/components/toolbar/tools/routing/RoutingControlPopup.svelte b/website/src/lib/components/toolbar/tools/routing/RoutingControlPopup.svelte
index fd3bfac1..a9e8e3fd 100644
--- a/website/src/lib/components/toolbar/tools/routing/RoutingControlPopup.svelte
+++ b/website/src/lib/components/toolbar/tools/routing/RoutingControlPopup.svelte
@@ -2,7 +2,8 @@
 	import * as Card from '$lib/components/ui/card';
 	import { Button } from '$lib/components/ui/button';
 	import Shortcut from '$lib/components/Shortcut.svelte';
-	import { Trash2 } from 'lucide-svelte';
+	import { canChangeStart } from './RoutingControls';
+	import { CirclePlay, Trash2 } from 'lucide-svelte';
 
 	import { _ } from 'svelte-i18n';
 
@@ -12,6 +13,16 @@
 <div bind:this={element} class="hidden">
 	<Card.Root class="border-none shadow-md text-base">
 		<Card.Content class="flex flex-col p-1">
+			{#if $canChangeStart}
+				<Button
+					class="w-full px-2 py-1 h-6 justify-start"
+					variant="ghost"
+					on:click={() => element.dispatchEvent(new CustomEvent('change-start'))}
+				>
+					<CirclePlay size="16" class="mr-1" />
+					{$_('toolbar.routing.start_loop_here')}
+				</Button>
+			{/if}
 			<Button
 				class="w-full px-2 py-1 h-6 justify-start"
 				variant="ghost"
diff --git a/website/src/lib/components/toolbar/tools/routing/RoutingControls.ts b/website/src/lib/components/toolbar/tools/routing/RoutingControls.ts
index b6736b35..c10ce8a0 100644
--- a/website/src/lib/components/toolbar/tools/routing/RoutingControls.ts
+++ b/website/src/lib/components/toolbar/tools/routing/RoutingControls.ts
@@ -1,6 +1,6 @@
 import { distance, type Coordinates, TrackPoint, TrackSegment } from "gpx";
 import { original } from "immer";
-import { get, type Readable } from "svelte/store";
+import { get, writable, type Readable } from "svelte/store";
 import mapboxgl from "mapbox-gl";
 import { route } from "./Routing";
 
@@ -13,6 +13,8 @@ import { ListFileItem, ListTrackSegmentItem } from "$lib/components/file-list/Fi
 import { currentTool, Tool } from "$lib/stores";
 import { resetCursor, setCrosshairCursor, setGrabbingCursor } from "$lib/utils";
 
+export const canChangeStart = writable(false);
+
 export class RoutingControls {
     active: boolean = false;
     map: mapboxgl.Map;
@@ -182,13 +184,27 @@ export class RoutingControls {
                 return;
             }
 
+            canChangeStart.update(() => {
+                if (anchor.point._data.index === 0) {
+                    return false;
+                }
+                let segment = anchor.segment;
+                if (distance(segment.trkpt[0].getCoordinates(), segment.trkpt[segment.trkpt.length - 1].getCoordinates()) > 1000) {
+                    return false;
+                }
+                return true;
+            });
+
             marker.setPopup(this.popup);
             marker.togglePopup();
 
             let deleteThisAnchor = this.getDeleteAnchor(anchor);
             this.popupElement.addEventListener('delete', deleteThisAnchor); // Register the delete event for this anchor
+            let startLoopAtThisAnchor = this.getStartLoopAtAnchor(anchor);
+            this.popupElement.addEventListener('change-start', startLoopAtThisAnchor); // Register the start loop event for this anchor
             this.popup.once('close', () => {
                 this.popupElement.removeEventListener('delete', deleteThisAnchor);
+                this.popupElement.removeEventListener('change-start', startLoopAtThisAnchor);
             });
         });
 
@@ -338,6 +354,25 @@ export class RoutingControls {
         }
     }
 
+    getStartLoopAtAnchor(anchor: Anchor) {
+        return () => this.startLoopAtAnchor(anchor);
+    }
+
+    startLoopAtAnchor(anchor: Anchor) {
+        this.popup.remove();
+
+        let file = get(this.file)?.file;
+        if (!file) {
+            return;
+        }
+
+        let segment = anchor.segment;
+        dbUtils.applyToFile(this.fileId, (file) => {
+            let newFile = file.replaceTrackPoints(anchor.trackIndex, anchor.segmentIndex, segment.trkpt.length, segment.trkpt.length - 1, segment.trkpt.slice(0, anchor.point._data.index));
+            return newFile.replaceTrackPoints(anchor.trackIndex, anchor.segmentIndex, 0, anchor.point._data.index - 1, []);
+        });
+    }
+
     async appendAnchor(e: mapboxgl.MapMouseEvent) { // Add a new anchor to the end of the last segment
         this.appendAnchorWithCoordinates({
             lat: e.lngLat.lat,
@@ -372,11 +407,6 @@ export class RoutingControls {
     }
 
     routeToStart() {
-        let file = get(this.file)?.file;
-        if (!file) {
-            return;
-        }
-
         if (this.anchors.length === 0) {
             return;
         }
@@ -392,11 +422,6 @@ export class RoutingControls {
     }
 
     createRoundTrip() {
-        let file = get(this.file)?.file;
-        if (!file) {
-            return;
-        }
-
         if (this.anchors.length === 0) {
             return;
         }
diff --git a/website/src/locales/en.json b/website/src/locales/en.json
index 4add8aee..a7d1eeea 100644
--- a/website/src/locales/en.json
+++ b/website/src/locales/en.json
@@ -60,6 +60,7 @@
                 "button": "Round trip",
                 "tooltip": "Return to the starting point by the same route"
             },
+            "start_loop_here": "Start loop here",
             "help_no_file": "Select a file item to use the routing tool, or create a new file from the menu",
             "help_multiple_files": "Select a single file item to use the routing tool",
             "help": "Click on the map to add a new anchor point, or drag existing ones to change the route",
@@ -128,7 +129,7 @@
             "help_merge_contents": "Merging the contents of the selected file items will group all the contents inside the first file item",
             "help_cannot_merge_contents": "Your selection needs to contain several file items to merge their contents"
         },
-        "extract_tooltip": "Extract inner tracks or segments",
+        "extract_tooltip": "Extract contents",
         "waypoint_tooltip": "Create and edit points of interest",
         "reduce": {
             "tooltip": "Reduce the number of GPS points",