diff --git a/components/src/maplibre/Tooltip/Tooltip.svelte b/components/src/maplibre/Tooltip/Tooltip.svelte
index a46c1866..ece7927b 100644
--- a/components/src/maplibre/Tooltip/Tooltip.svelte
+++ b/components/src/maplibre/Tooltip/Tooltip.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { onDestroy, type Snippet } from 'svelte';
+	import { onDestroy, tick, type Snippet } from 'svelte';
 	import maplibre, { type Listener, type LngLatLike } from 'maplibre-gl';
 	import { getMapContext } from '../context.svelte.js';
 	import { resetPopupEventListener } from '../utils';
@@ -51,6 +51,10 @@
 	$effect(() => {
 		if (position && el && map) {
 			tooltip.setLngLat(position).setDOMContent(el).addTo(map);
+			// Ensure tooltip doesn't extend beyond the map canvas, see #223
+			tick().then(() => {
+				tooltip._update();
+			});
 		} else {
 			tooltip.remove();
 		}