diff --git a/src/components/modal/EditDate.vue b/src/components/modal/EditDate.vue
index cc9255e84..e5ae6f8e0 100644
--- a/src/components/modal/EditDate.vue
+++ b/src/components/modal/EditDate.vue
@@ -18,6 +18,7 @@
         :placeholder="t('memories', 'Year')"
         :disabled="disabled"
         @input="newestChange()"
+        @keypress.enter="$emit('save')"
       />
       <NcTextField
         class="field"
@@ -30,6 +31,7 @@
         :placeholder="t('memories', 'Month')"
         :disabled="disabled"
         @input="newestChange()"
+        @keypress.enter="$emit('save')"
       />
       <NcTextField
         class="field"
@@ -42,6 +44,7 @@
         :placeholder="t('memories', 'Day')"
         :disabled="disabled"
         @input="newestChange()"
+        @keypress.enter="$emit('save')"
       />
       <NcTextField
         class="field"
@@ -54,6 +57,7 @@
         :placeholder="t('memories', 'Hour')"
         :disabled="disabled"
         @input="newestChange(true)"
+        @keypress.enter="$emit('save')"
       />
       <NcTextField
         class="field"
@@ -65,6 +69,7 @@
         :placeholder="t('memories', 'Minute')"
         :disabled="disabled"
         @input="newestChange(true)"
+        @keypress.enter="$emit('save')"
       />
     </div>
 
@@ -87,6 +92,7 @@
           :placeholder="t('memories', 'Year')"
           :disabled="disabled"
           @input="oldestChange()"
+          @keypress.enter="$emit('save')"
         />
         <NcTextField
           class="field"
@@ -99,6 +105,7 @@
           :placeholder="t('memories', 'Month')"
           :disabled="disabled"
           @input="oldestChange()"
+          @keypress.enter="$emit('save')"
         />
         <NcTextField
           class="field"
@@ -111,6 +118,7 @@
           :placeholder="t('memories', 'Day')"
           :disabled="disabled"
           @input="oldestChange()"
+          @keypress.enter="$emit('save')"
         />
         <NcTextField
           class="field"
@@ -123,6 +131,7 @@
           :placeholder="t('memories', 'Hour')"
           :disabled="disabled"
           @input="oldestChange()"
+          @keypress.enter="$emit('save')"
         />
         <NcTextField
           class="field"
@@ -134,6 +143,7 @@
           :placeholder="t('memories', 'Minute')"
           :disabled="disabled"
           @input="oldestChange()"
+          @keypress.enter="$emit('save')"
         />
       </div>
     </div>
@@ -166,6 +176,10 @@ export default defineComponent({
     },
   },
 
+  emits: {
+    save: () => true,
+  },
+
   data: () => ({
     sortedPhotos: [] as IPhoto[],
 
diff --git a/src/components/modal/EditMetadataModal.vue b/src/components/modal/EditMetadataModal.vue
index 5985d0351..e0847325b 100644
--- a/src/components/modal/EditMetadataModal.vue
+++ b/src/components/modal/EditMetadataModal.vue
@@ -15,7 +15,7 @@
         <div class="title-text">
           {{ t('memories', 'Date / Time') }}
         </div>
-        <EditDate ref="editDate" :photos="photos" :disabled="processing" />
+        <EditDate ref="editDate" :photos="photos" :disabled="processing" @save="save" />
       </div>
 
       <div v-if="config.systemtags_enabled && sections.includes(2)">