diff --git a/src/components/card/CardSidebarTabDetails.vue b/src/components/card/CardSidebarTabDetails.vue
index c70ebdf07..5602d115a 100644
--- a/src/components/card/CardSidebarTabDetails.vue
+++ b/src/components/card/CardSidebarTabDetails.vue
@@ -20,12 +20,10 @@
 
 		<StartDateSelector :card="card"
 			:can-edit="canEdit"
-			@change="updateCardStartDate"
 			@input="debouncedUpdateCardStartDate" />
 
 		<DueDateSelector :card="card"
 			:can-edit="canEdit"
-			@change="updateCardDue"
 			@input="debouncedUpdateCardDue" />
 
 		<DependentCardsSelector :card="card"
@@ -163,7 +161,7 @@ export default {
 
 		debouncedUpdateCardDue: debounce(function(val) {
 			this.updateCardDue(val)
-		}, 500),
+		}, 500, { leading: true }),
 
 		updateCardStartDate(val) {
 			this.$store.dispatch('updateCardStartDate', {
@@ -174,7 +172,7 @@ export default {
 
 		debouncedUpdateCardStartDate: debounce(function(val) {
 			this.updateCardStartDate(val)
-		}, 500),
+		}, 500, { leading: true }),
 
 		addLabelToCard(newLabel) {
 			this.copiedCard.labels.push(newLabel)
diff --git a/src/components/card/DueDateSelector.vue b/src/components/card/DueDateSelector.vue
index 1f720303d..1e7523775 100644
--- a/src/components/card/DueDateSelector.vue
+++ b/src/components/card/DueDateSelector.vue
@@ -14,7 +14,7 @@
 				:hide-label="true"
 				type="datetime-local" />
 			<NcActions v-if="canEdit"
-				:menu-title="!duedate ? t('deck', 'Add due date') : null"
+				:menu-name="!duedate ? t('deck', 'Add due date') : null"
 				type="tertiary"
 				data-cy-due-date-actions>
 				<template v-if="!duedate" #icon>
@@ -220,12 +220,10 @@ export default defineComponent({
 		},
 		removeDue() {
 			this.duedate = null
-			this.$emit('change', null)
 
 		},
 		selectShortcut(shortcut) {
 			this.duedate = shortcut.timestamp
-			this.$emit('change', shortcut.timestamp)
 		},
 		getTimestamp(momentObject) {
 			return momentObject?.minute(0).second(0).millisecond(0).toDate() || null
diff --git a/src/components/card/StartDateSelector.vue b/src/components/card/StartDateSelector.vue
index ea497aaf4..1e632f6e5 100644
--- a/src/components/card/StartDateSelector.vue
+++ b/src/components/card/StartDateSelector.vue
@@ -13,7 +13,7 @@
 				:hide-label="true"
 				type="datetime-local" />
 			<NcActions v-if="canEdit"
-				:menu-title="!startdate ? t('deck', 'Add start date') : null"
+				:force-name="!startdate"
 				type="tertiary">
 				<template v-if="!startdate" #icon>
 					<Plus :size="20" />
@@ -24,7 +24,7 @@
 					<template #icon>
 						<Plus :size="20" />
 					</template>
-					{{ t('deck', 'Choose a date') }}
+					{{ t('deck', 'Add start date') }}
 				</NcActionButton>
 				<NcActionButton v-else
 					icon="icon-delete"
@@ -99,7 +99,6 @@ export default defineComponent({
 		},
 		removeStartDate() {
 			this.startdate = null
-			this.$emit('change', null)
 		},
 	},
 })