diff --git a/Logic/Actors/StrayClickHandler.ts b/Logic/Actors/StrayClickHandler.ts
index b4d6300700..3e7609fd41 100644
--- a/Logic/Actors/StrayClickHandler.ts
+++ b/Logic/Actors/StrayClickHandler.ts
@@ -47,7 +47,12 @@ export default class StrayClickHandler {
                     popupAnchor: [0, -45]
                 })
             });
-            const popup = L.popup().setContent("<div id='strayclick'></div>");
+            const popup = L.popup({
+                autoPan: true,
+                autoPanPaddingTopLeft: [15,15],
+                closeOnEscapeKey: true,
+                autoClose: true
+            }).setContent("<div id='strayclick' style='height: 65vh'></div>");
             self._lastMarker.addTo(leafletMap.data);
             self._lastMarker.bindPopup(popup);
 
diff --git a/State.ts b/State.ts
index 6885109491..53d9e1b6e3 100644
--- a/State.ts
+++ b/State.ts
@@ -196,6 +196,12 @@ export default class State {
                 "Disables/Enables the layer control");
             this.featureSwitchAddNew = featSw("fs-add-new", (layoutToUse) => layoutToUse?.enableAddNewPoints ?? true,
                 "Disables/Enables the 'add new feature'-popup. (A theme without presets might not have it in the first place)");
+            this.featureSwitchUserbadge.addCallbackAndRun(userbadge => {
+                if (!userbadge) {
+                    this.featureSwitchAddNew.setData(false)
+                }
+            })
+
             this.featureSwitchWelcomeMessage = featSw("fs-welcome-message", () => true,
                 "Disables/enables the help menu or welcome message");
             this.featureSwitchIframe = featSw("fs-iframe", () => false,
diff --git a/UI/ShowDataLayer.ts b/UI/ShowDataLayer.ts
index 70d7e52036..b8809800c1 100644
--- a/UI/ShowDataLayer.ts
+++ b/UI/ShowDataLayer.ts
@@ -146,7 +146,9 @@ export default class ShowDataLayer {
         const popup = L.popup({
             autoPan: true,
             closeOnEscapeKey: true,
-            closeButton: false
+            closeButton: false,
+            autoPanPaddingTopLeft: [15,15],
+            
         }, leafletLayer);
 
         leafletLayer.bindPopup(popup);