diff --git a/src/UI/BigComponents/OpenBackgroundSelectorButton.svelte b/src/UI/BigComponents/OpenBackgroundSelectorButton.svelte
index af07c92b3..de9658cdd 100644
--- a/src/UI/BigComponents/OpenBackgroundSelectorButton.svelte
+++ b/src/UI/BigComponents/OpenBackgroundSelectorButton.svelte
@@ -9,11 +9,12 @@
   import MapControlButton from "../Base/MapControlButton.svelte"
   import Tr from "../Base/Tr.svelte"
   import StyleLoadingIndicator from "../Map/StyleLoadingIndicator.svelte"
-  import { UIEventSource } from "../../Logic/UIEventSource"
+  import { Store, UIEventSource } from "../../Logic/UIEventSource"
   import { Map as MlMap } from "maplibre-gl"
   import ThemeViewState from "../../Models/ThemeViewState"
 
   export let state: ThemeViewState
+  export let map: Store<MlMap> = undefined
   export let hideTooltip = false
 </script>
 
@@ -22,7 +23,7 @@
   on:click={() => state.guistate.backgroundLayerSelectionIsOpened.setData(true)}
 >
   
-  <StyleLoadingIndicator map={state.map} rasterLayer={state.mapProperties.rasterLayer} >
+  <StyleLoadingIndicator map={map ?? state.map} rasterLayer={state.mapProperties.rasterLayer} >
     <Square3Stack3dIcon class="h-6 w-6" />
   </StyleLoadingIndicator>
   {#if !hideTooltip}
diff --git a/src/UI/Popup/ImportButtons/WayImportFlow.svelte b/src/UI/Popup/ImportButtons/WayImportFlow.svelte
index 5e636539c..fb21db3d7 100644
--- a/src/UI/Popup/ImportButtons/WayImportFlow.svelte
+++ b/src/UI/Popup/ImportButtons/WayImportFlow.svelte
@@ -51,7 +51,7 @@
       <MaplibreMap {map} mapProperties={mla} />
     </div>
     <div class="absolute bottom-0">
-      <OpenBackgroundSelectorButton />
+      <OpenBackgroundSelectorButton {state} {map} />
     </div>
   </div>
 </ImportFlow>