diff --git a/vue3/src/components/model_editors/AccessTokenEditor.vue b/vue3/src/components/model_editors/AccessTokenEditor.vue
index d15bbc520..3167458a2 100644
--- a/vue3/src/components/model_editors/AccessTokenEditor.vue
+++ b/vue3/src/components/model_editors/AccessTokenEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/AutomationEditor.vue b/vue3/src/components/model_editors/AutomationEditor.vue
index 507df629d..767ed1b1d 100644
--- a/vue3/src/components/model_editors/AutomationEditor.vue
+++ b/vue3/src/components/model_editors/AutomationEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/CustomFilterEditor.vue b/vue3/src/components/model_editors/CustomFilterEditor.vue
index 95a00b92b..00125a78e 100644
--- a/vue3/src/components/model_editors/CustomFilterEditor.vue
+++ b/vue3/src/components/model_editors/CustomFilterEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/FoodEditor.vue b/vue3/src/components/model_editors/FoodEditor.vue
index 15d989e7a..e8c087996 100644
--- a/vue3/src/components/model_editors/FoodEditor.vue
+++ b/vue3/src/components/model_editors/FoodEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject(); saveObjectConversions()"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/InviteLinkEditor.vue b/vue3/src/components/model_editors/InviteLinkEditor.vue
index 8e055c00c..07e644e3d 100644
--- a/vue3/src/components/model_editors/InviteLinkEditor.vue
+++ b/vue3/src/components/model_editors/InviteLinkEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/KeywordEditor.vue b/vue3/src/components/model_editors/KeywordEditor.vue
index f6823255c..ed0bffdb1 100644
--- a/vue3/src/components/model_editors/KeywordEditor.vue
+++ b/vue3/src/components/model_editors/KeywordEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/MealPlanEditor.vue b/vue3/src/components/model_editors/MealPlanEditor.vue
index 4529e29eb..732e84e39 100644
--- a/vue3/src/components/model_editors/MealPlanEditor.vue
+++ b/vue3/src/components/model_editors/MealPlanEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject().then((obj:MealPlan) => { useMealPlanStore().plans.set(obj.id, obj); loadShoppingListEntries()})"
         @delete="useMealPlanStore().plans.delete(editingObj.id); deleteObject()"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/MealTypeEditor.vue b/vue3/src/components/model_editors/MealTypeEditor.vue
index 4fea2fb52..84493c746 100644
--- a/vue3/src/components/model_editors/MealTypeEditor.vue
+++ b/vue3/src/components/model_editors/MealTypeEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/PropertyEditor.vue b/vue3/src/components/model_editors/PropertyEditor.vue
index 15c015575..b64950da9 100644
--- a/vue3/src/components/model_editors/PropertyEditor.vue
+++ b/vue3/src/components/model_editors/PropertyEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/PropertyTypeEditor.vue b/vue3/src/components/model_editors/PropertyTypeEditor.vue
index 1c207f816..3f51bff3b 100644
--- a/vue3/src/components/model_editors/PropertyTypeEditor.vue
+++ b/vue3/src/components/model_editors/PropertyTypeEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/RecipeBookEditor.vue b/vue3/src/components/model_editors/RecipeBookEditor.vue
index 62c12996d..e3837ac07 100644
--- a/vue3/src/components/model_editors/RecipeBookEditor.vue
+++ b/vue3/src/components/model_editors/RecipeBookEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/RecipeEditor.vue b/vue3/src/components/model_editors/RecipeEditor.vue
index d99440e04..256834b42 100644
--- a/vue3/src/components/model_editors/RecipeEditor.vue
+++ b/vue3/src/components/model_editors/RecipeEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveRecipe"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/ShoppingListEntryEditor.vue b/vue3/src/components/model_editors/ShoppingListEntryEditor.vue
index b1191f6ec..b4c0bee4f 100644
--- a/vue3/src/components/model_editors/ShoppingListEntryEditor.vue
+++ b/vue3/src/components/model_editors/ShoppingListEntryEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/SupermarketCategoryEditor.vue b/vue3/src/components/model_editors/SupermarketCategoryEditor.vue
index 78d38fa8e..17a47d9e0 100644
--- a/vue3/src/components/model_editors/SupermarketCategoryEditor.vue
+++ b/vue3/src/components/model_editors/SupermarketCategoryEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/SupermarketEditor.vue b/vue3/src/components/model_editors/SupermarketEditor.vue
index ba4d71e9e..d02a5f93e 100644
--- a/vue3/src/components/model_editors/SupermarketEditor.vue
+++ b/vue3/src/components/model_editors/SupermarketEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/UnitConversionEditor.vue b/vue3/src/components/model_editors/UnitConversionEditor.vue
index 66eba26cb..d89750608 100644
--- a/vue3/src/components/model_editors/UnitConversionEditor.vue
+++ b/vue3/src/components/model_editors/UnitConversionEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/UnitEditor.vue b/vue3/src/components/model_editors/UnitEditor.vue
index 74d2e3980..5e4d80580 100644
--- a/vue3/src/components/model_editors/UnitEditor.vue
+++ b/vue3/src/components/model_editors/UnitEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/UserFileEditor.vue b/vue3/src/components/model_editors/UserFileEditor.vue
index 6fde297bc..f69f737db 100644
--- a/vue3/src/components/model_editors/UserFileEditor.vue
+++ b/vue3/src/components/model_editors/UserFileEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveFile"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"
diff --git a/vue3/src/components/model_editors/UserSpaceEditor.vue b/vue3/src/components/model_editors/UserSpaceEditor.vue
index 792a58720..7c1c9f93b 100644
--- a/vue3/src/components/model_editors/UserSpaceEditor.vue
+++ b/vue3/src/components/model_editors/UserSpaceEditor.vue
@@ -4,7 +4,7 @@
         :dialog="dialog"
         @save="saveObject"
         @delete="deleteObject"
-        @close="emit('close')"
+        @close="emit('close'); editingObjChanged = false"
         :is-update="isUpdate()"
         :is-changed="editingObjChanged"
         :model-class="modelClass"