diff --git a/src/UI/BigComponents/Geosearch.svelte b/src/UI/BigComponents/Geosearch.svelte
index 2aeca7eda..4934f81b4 100644
--- a/src/UI/BigComponents/Geosearch.svelte
+++ b/src/UI/BigComponents/Geosearch.svelte
@@ -11,11 +11,13 @@
   import { placeholder } from "../../Utils/placeholder"
   import { SearchIcon } from "@rgossiaux/svelte-heroicons/solid"
   import { ariaLabel } from "../../Utils/ariaLabel"
+  import { GeoLocationState } from "../../Logic/State/GeoLocationState"
 
   export let perLayer: ReadonlyMap<string, GeoIndexedStoreForLayer> | undefined = undefined
   export let bounds: UIEventSource<BBox>
   export let selectedElement: UIEventSource<Feature> | undefined = undefined
 
+  export let geolocationState: GeoLocationState | undefined = undefined
   export let clearAfterView: boolean = true
   let searchContents: string = ""
   export let triggerSearch: UIEventSource<any> = new UIEventSource<any>(undefined)
@@ -55,6 +57,8 @@
   async function performSearch() {
     try {
       isRunning = true
+      geolocationState?.allowMoving.setData(true)
+      geolocationState?.requestMoment.setData(undefined) // If the GPS is still searching for a fix, we say that we don't want tozoom to it anymore
       searchContents = searchContents?.trim() ?? ""
 
       if (searchContents === "") {
diff --git a/src/UI/BigComponents/ThemeIntroPanel.svelte b/src/UI/BigComponents/ThemeIntroPanel.svelte
index f706f01e5..922153eb7 100644
--- a/src/UI/BigComponents/ThemeIntroPanel.svelte
+++ b/src/UI/BigComponents/ThemeIntroPanel.svelte
@@ -113,6 +113,7 @@
               perLayer={state.perLayer}
               {selectedElement}
               {triggerSearch}
+              geolocationState={state.geolocation.geolocationState}
             />
           </div>
           <button
diff --git a/src/UI/ThemeViewGUI.svelte b/src/UI/ThemeViewGUI.svelte
index 26e4f6e98..4941975b4 100644
--- a/src/UI/ThemeViewGUI.svelte
+++ b/src/UI/ThemeViewGUI.svelte
@@ -203,6 +203,8 @@
         }}
         perLayer={state.perLayer}
         selectedElement={state.selectedElement}
+        geolocationState={state.geolocation.geolocationState}
+
       />
     </If>
   </div>