diff --git a/index.css b/index.css
index 43fbd8966..25ed81ff6 100644
--- a/index.css
+++ b/index.css
@@ -1197,6 +1197,7 @@ form {
     background-color: white;
     border-radius: 2em;
     display: block;
+    width: min-content;
 }
 
 .iframe-escape img{
diff --git a/index.ts b/index.ts
index 9d3f3625d..e2d38fe9a 100644
--- a/index.ts
+++ b/index.ts
@@ -167,7 +167,10 @@ InitUiElements.OnlyIf(State.state.featureSwitchWelcomeMessage, () => {
 });
 
 if ((window != window.top && !State.state.featureSwitchWelcomeMessage.data) || State.state.featureSwitchIframe.data) {
-    new FixedUiElement(`<a href='${window.location}' target='_blank'><span class='iframe-escape'><img src='assets/pop-out.svg'></span></a>`).AttachTo("top-right")
+    const currentLocation = State.state.locationControl;
+    const url = `${window.location.origin}${window.location.pathname}?z=${currentLocation.data.zoom}&lat=${currentLocation.data.lat}&lon=${currentLocation.data.lon}`;
+    
+    new FixedUiElement(`<a href='${url}' target='_blank'><span class='iframe-escape'><img src='assets/pop-out.svg'></span></a>`).AttachTo("messagesbox")
 }