diff --git a/package-lock.json b/package-lock.json
index 5a58d8d009..ffaf6cd84d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -82,6 +82,7 @@
         "showdown": "^2.1.0",
         "svelte": "^3.59.2",
         "svg-path-parser": "^1.1.0",
+        "tag2link": "^2025.3.21",
         "tailwind-merge": "^1.14.0",
         "tailwindcss": "^3.4.17",
         "ts-node": "^10.9.2",
@@ -26392,6 +26393,12 @@
       "version": "3.2.4",
       "license": "MIT"
     },
+    "node_modules/tag2link": {
+      "version": "2025.3.21",
+      "resolved": "https://registry.npmjs.org/tag2link/-/tag2link-2025.3.21.tgz",
+      "integrity": "sha512-JvRTQdY/z0vAEFUzL7rhLndNiDnStlurW+1jgXL5FW+GppR2T/dq2lXMEppbFNxJ9C4h5b+ykjcMPH791YeLdA==",
+      "license": "ISC"
+    },
     "node_modules/tailwind-merge": {
       "version": "1.14.0",
       "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.14.0.tgz",
@@ -48535,6 +48542,11 @@
     "symbol-tree": {
       "version": "3.2.4"
     },
+    "tag2link": {
+      "version": "2025.3.21",
+      "resolved": "https://registry.npmjs.org/tag2link/-/tag2link-2025.3.21.tgz",
+      "integrity": "sha512-JvRTQdY/z0vAEFUzL7rhLndNiDnStlurW+1jgXL5FW+GppR2T/dq2lXMEppbFNxJ9C4h5b+ykjcMPH791YeLdA=="
+    },
     "tailwind-merge": {
       "version": "1.14.0",
       "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.14.0.tgz",
diff --git a/package.json b/package.json
index 6f9397d5d0..a88a9112d9 100644
--- a/package.json
+++ b/package.json
@@ -244,6 +244,7 @@
     "showdown": "^2.1.0",
     "svelte": "^3.59.2",
     "svg-path-parser": "^1.1.0",
+    "tag2link": "^2025.3.21",
     "tailwind-merge": "^1.14.0",
     "tailwindcss": "^3.4.17",
     "ts-node": "^10.9.2",
diff --git a/src/UI/Popup/AllTagsPanel.svelte b/src/UI/Popup/AllTagsPanel/AllTagsPanel.svelte
similarity index 86%
rename from src/UI/Popup/AllTagsPanel.svelte
rename to src/UI/Popup/AllTagsPanel/AllTagsPanel.svelte
index 39a66f3353..33b710ad09 100644
--- a/src/UI/Popup/AllTagsPanel.svelte
+++ b/src/UI/Popup/AllTagsPanel/AllTagsPanel.svelte
@@ -1,10 +1,12 @@
 
+
+{#if url}
+  
+    {$tags[key]}
+  
+{:else}
+  {$tags[key]}
+{/if}
diff --git a/src/UI/SpecialVisualisations/SettingsVisualisations.ts b/src/UI/SpecialVisualisations/SettingsVisualisations.ts
index ea52ea6274..d22cf68882 100644
--- a/src/UI/SpecialVisualisations/SettingsVisualisations.ts
+++ b/src/UI/SpecialVisualisations/SettingsVisualisations.ts
@@ -6,7 +6,7 @@ import LogoutButton from "../Base/LogoutButton.svelte"
 import LoginButton from "../Base/LoginButton.svelte"
 import ThemeViewState from "../../Models/ThemeViewState"
 import OrientationDebugPanel from "../Debug/OrientationDebugPanel.svelte"
-import AllTagsPanel from "../Popup/AllTagsPanel.svelte"
+import AllTagsPanel from "../Popup/AllTagsPanel/AllTagsPanel.svelte"
 import { ImmutableStore, UIEventSource } from "../../Logic/UIEventSource"
 import ClearCaches from "../Popup/ClearCaches.svelte"
 import Locale from "../i18n/Locale"
diff --git a/src/UI/SpecialVisualizations.ts b/src/UI/SpecialVisualizations.ts
index a212ae0115..0fdee9e989 100644
--- a/src/UI/SpecialVisualizations.ts
+++ b/src/UI/SpecialVisualizations.ts
@@ -10,7 +10,7 @@ import { HistogramViz } from "./Popup/HistogramViz"
 import { UploadToOsmViz } from "./Popup/UploadToOsmViz"
 import { MultiApplyViz } from "./Popup/MultiApplyViz"
 import { UIEventSource } from "../Logic/UIEventSource"
-import AllTagsPanel from "./Popup/AllTagsPanel.svelte"
+import AllTagsPanel from "./Popup/AllTagsPanel/AllTagsPanel.svelte"
 import { VariableUiElement } from "./Base/VariableUIElement"
 import { Translation } from "./i18n/Translation"
 import Translations from "./i18n/Translations"
diff --git a/src/UI/Studio/EditLayer.svelte b/src/UI/Studio/EditLayer.svelte
index 79ef7776e1..c561edfe1a 100644
--- a/src/UI/Studio/EditLayer.svelte
+++ b/src/UI/Studio/EditLayer.svelte
@@ -13,7 +13,7 @@
   import SchemaBasedInput from "./SchemaBasedInput.svelte"
   import FloatOver from "../Base/FloatOver.svelte"
   import TagRenderingInput from "./TagRenderingInput.svelte"
-  import AllTagsPanel from "../Popup/AllTagsPanel.svelte"
+  import AllTagsPanel from "../Popup/AllTagsPanel/AllTagsPanel.svelte"
   import QuestionPreview from "./QuestionPreview.svelte"
   import ShowConversionMessages from "./ShowConversionMessages.svelte"
   import RawEditor from "./RawEditor.svelte"