diff --git a/src/components/EventEditor.vue b/src/components/EventEditor.vue
index 739fb53..d409cd2 100644
--- a/src/components/EventEditor.vue
+++ b/src/components/EventEditor.vue
@@ -215,6 +215,12 @@ watch(
           @update:description="entityObject!.description = $event"
         />
 
+        <EventEditorTags
+          :mode="mode"
+          :tags="entityObject!.tags"
+          @update:tags="entityObject!.tags = $event"
+        />
+
         <EventEditorDates
           :mode="mode"
           :starts-on="entityObject!.startsOn"
@@ -260,12 +266,6 @@ watch(
           @remove-notification="removeNotification"
         />
 
-        <EventEditorTags
-          :mode="mode"
-          :tags="entityObject!.tags"
-          @update:tags="entityObject!.tags = $event"
-        />
-
         <!-- Metadata for view mode -->
         <div v-if="mode === 'view' && entityObject!.created" class="event-editor-section">
           <v-divider class="mb-4"></v-divider>