diff --git a/src/components/mailFilter/MailFilterUpdateModal.vue b/src/components/mailFilter/MailFilterUpdateModal.vue
index f412314502..63d64b6b64 100644
--- a/src/components/mailFilter/MailFilterUpdateModal.vue
+++ b/src/components/mailFilter/MailFilterUpdateModal.vue
@@ -60,7 +60,7 @@
 
 			<NcButton type="primary"
 				native-type="submit"
-				@click="updateFilter">
+				@click.prevent.stop="updateFilter">
 				<template #icon>
 					<NcLoadingIcon v-if="loading" :size="16" />
 					<IconCheck v-else :size="16" />
diff --git a/src/components/mailFilter/MailFilters.vue b/src/components/mailFilter/MailFilters.vue
index 7b3d69b9c8..43083ca539 100644
--- a/src/components/mailFilter/MailFilters.vue
+++ b/src/components/mailFilter/MailFilters.vue
@@ -122,6 +122,7 @@ export default {
 				priority,
 			}
 			this.showUpdateModal = true
+			this.loading = false
 		},
 		openUpdateModal(filter) {
 			this.currentFilter = filter
@@ -134,7 +135,6 @@ export default {
 		},
 		async updateFilter(filter) {
 			this.loading = true
-
 			this.mailFilterStore.$patch((state) => {
 				const index = state.filters.findIndex((item) => item.id === filter.id)
 				logger.debug('update filter', { filter, index })