diff --git a/src/lib/draw/GeometryMode.svelte b/src/lib/draw/GeometryMode.svelte
index 84b5570e..40a60de7 100644
--- a/src/lib/draw/GeometryMode.svelte
+++ b/src/lib/draw/GeometryMode.svelte
@@ -210,7 +210,7 @@
   {:else if currentlyEditingControls == "snap-polygon"}
     <SnapPolygonControls {routeTool} />
   {:else if currentlyEditingControls == "route"}
-    <RouteControls {routeTool} />
+    <RouteControls {routeTool} extendRoute={false} />
   {:else}
     <p>Click an object to edit its geometry</p>
   {/if}
diff --git a/src/lib/draw/route/RouteControls.svelte b/src/lib/draw/route/RouteControls.svelte
index 6c57915c..ca71b42a 100644
--- a/src/lib/draw/route/RouteControls.svelte
+++ b/src/lib/draw/route/RouteControls.svelte
@@ -4,10 +4,12 @@
   import CollapsibleCard from "../../common/CollapsibleCard.svelte";
 
   export let routeTool: RouteTool;
+  // Start with this enabled or disabled, based on whether we're drawing a new
+  // route or editing an existing.
+  export let extendRoute: boolean;
 
   // TODO Save this in the route
   let avoidDoublingBack = false;
-  let extendRoute = false;
   $: routeTool.setRouteConfig({
     avoid_doubling_back: avoidDoublingBack,
     extend_route: extendRoute,
diff --git a/src/lib/draw/route/RouteMode.svelte b/src/lib/draw/route/RouteMode.svelte
index 473332d6..5b8d9cef 100644
--- a/src/lib/draw/route/RouteMode.svelte
+++ b/src/lib/draw/route/RouteMode.svelte
@@ -69,5 +69,5 @@
   <!-- TODO the text should be fixed, and the progress bar float -->
   <div bind:this={progress}>Route tool loading...</div>
 {:else if mode == thisMode}
-  <RouteControls {routeTool} />
+  <RouteControls {routeTool} extendRoute />
 {/if}