diff --git a/website/src/lib/components/embedding/Embedding.svelte b/website/src/lib/components/embedding/Embedding.svelte
index 9334db16..7c148a12 100644
--- a/website/src/lib/components/embedding/Embedding.svelte
+++ b/website/src/lib/components/embedding/Embedding.svelte
@@ -18,7 +18,7 @@
 
 	$embedding = true;
 
-	const { currentBasemap, distanceUnits, velocityUnits, temperatureUnits } = settings;
+	const { currentBasemap, distanceUnits, velocityUnits, temperatureUnits, fileOrder } = settings;
 
 	export let options: EmbeddingOptions;
 
@@ -63,7 +63,7 @@
 						return;
 					}
 
-					let id = `gpx-${index}`;
+					let id = `gpx-${index}-embed`;
 					file._data.id = id;
 					let statistics = new GPXStatisticsTree(file);
 
@@ -87,6 +87,8 @@
 				return $fileObservers;
 			});
 
+			$fileOrder = [...$fileOrder.filter((id) => !id.includes('embed')), ...ids];
+
 			selection.update(($selection) => {
 				$selection.clear();
 				ids.forEach((id) => {
@@ -95,8 +97,6 @@
 				return $selection;
 			});
 
-			console.log($fileObservers, $selection);
-
 			map.subscribe(($map) => {
 				if ($map) {
 					$map.fitBounds(
@@ -155,6 +155,8 @@
 		if ($temperatureUnits !== prevUnits.temperature) {
 			$temperatureUnits = prevUnits.temperature;
 		}
+
+		$fileOrder = $fileOrder.filter((id) => !id.includes('embed'));
 	});
 </script>
 
diff --git a/website/src/lib/components/embedding/OpenIn.svelte b/website/src/lib/components/embedding/OpenIn.svelte
index 30f6fe1b..9159ed43 100644
--- a/website/src/lib/components/embedding/OpenIn.svelte
+++ b/website/src/lib/components/embedding/OpenIn.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
 	import { Button } from '$lib/components/ui/button';
 	import Logo from '$lib/components/Logo.svelte';
-	import { _ } from 'svelte-i18n';
+	import { getURLForLanguage } from '$lib/utils';
+	import { _, locale } from 'svelte-i18n';
 
 	export let files: string[];
 </script>
@@ -9,7 +10,7 @@
 <Button
 	variant="ghost"
 	class="absolute top-0 flex-wrap h-fit bg-background font-semibold rounded-md py-1 px-2 gap-1.5 xs:text-base mt-2.5 ml-2.5 mr-12"
-	href="./app?files={encodeURIComponent(JSON.stringify(files))}"
+	href="{getURLForLanguage($locale, '/embed')}?files={encodeURIComponent(JSON.stringify(files))}"
 	target="_blank"
 >
 	{$_('menu.open_in')}