diff --git a/frontend/components/EntityEdit.vue b/frontend/components/EntityEdit.vue
index 9555d48..85de39d 100644
--- a/frontend/components/EntityEdit.vue
+++ b/frontend/components/EntityEdit.vue
@@ -527,14 +527,13 @@ const updateItem = async () => {
   </UDashboardNavbar>
   <UDashboardNavbar
       v-else
-      :data-draggable-handle="props.draggable ? '' : undefined"
-      :class="props.draggable ? 'cursor-move select-none' : undefined"
       :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
   >
     <template #center>
       <h1
           v-if="item"
-          :class="['text-xl','font-medium']"
+          :data-draggable-handle="props.draggable ? '' : undefined"
+          :class="['text-xl', 'font-medium', props.draggable ? 'cursor-move select-none' : '']"
       >{{ item.id ? `${dataType.labelSingle} bearbeiten` : `${dataType.labelSingle} erstellen` }}</h1>
     </template>
     <template #right>
@@ -553,7 +552,8 @@ const updateItem = async () => {
         Erstellen
       </UButton>
       <UButton
-          @click="modal.close()"
+          @pointerdown.stop
+          @click.stop="modal.close()"
           color="red"
           class="ml-2"
           icon="i-heroicons-x-mark"