diff --git a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
index 771c844c5..00447458f 100644
--- a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
+++ b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
@@ -223,12 +223,6 @@
         selectedTags = undefined
       }
     }
-  }
-
-  function onSave(_ = undefined) {
-    if (selectedTags === undefined) {
-      return
-    }
 
     if (extraTags.data) {
       // Map the extraTags into an array of Tag objects
@@ -245,6 +239,12 @@
         console.error("selectedTags is not of type Tag or And")
       }
     }
+  }
+
+  function onSave(_ = undefined) {
+    if (selectedTags === undefined) {
+      return
+    }
 
     if (layer === undefined || (layer?.source === null && layer.id !== "favourite")) {
       /**