diff --git a/src/components/Editor/InvitationResponseButtons.vue b/src/components/Editor/InvitationResponseButtons.vue
index 0247030d38..d646e77d32 100644
--- a/src/components/Editor/InvitationResponseButtons.vue
+++ b/src/components/Editor/InvitationResponseButtons.vue
@@ -11,7 +11,6 @@
 			v-if="!isAccepted"
 			variant="primary"
 			class="invitation-response-buttons__button"
-			:disabled="loading"
 			@click="accept">
 			{{ t('calendar', 'Accept') }}
 		</NcButton>
@@ -19,7 +18,6 @@
 			v-if="!isDeclined"
 			variant="error"
 			class="invitation-response-buttons__button"
-			:disabled="loading"
 			@click="decline">
 			{{ t('calendar', 'Decline') }}
 		</NcButton>
@@ -27,13 +25,11 @@
 			<NcButton
 				v-if="!narrow"
 				class="invitation-response-buttons__button"
-				:disabled="loading"
 				@click="tentative">
 				{{ t('calendar', 'Tentative') }}
 			</NcButton>
 			<Actions v-else>
 				<ActionButton
-					:disabled="loading"
 					@click="tentative">
 					<template #icon>
 						<CalendarQuestionIcon :size="20" />
@@ -46,16 +42,12 @@
 </template>
 
 <script>
-import { showError, showSuccess } from '@nextcloud/dialogs'
 import {
 	NcActionButton as ActionButton,
 	NcActions as Actions,
 	NcButton,
 } from '@nextcloud/vue'
-import { mapStores } from 'pinia'
 import CalendarQuestionIcon from 'vue-material-design-icons/CalendarQuestionOutline.vue'
-import useCalendarObjectInstanceStore from '../../store/calendarObjectInstance.js'
-import logger from '../../utils/logger.js'
 
 export default {
 	name: 'InvitationResponseButtons',
@@ -88,14 +80,7 @@ export default {
 		},
 	},
 
-	data() {
-		return {
-			loading: false,
-		}
-	},
-
 	computed: {
-		...mapStores(useCalendarObjectInstanceStore),
 		isAccepted() {
 			return this.attendee.participationStatus === 'ACCEPTED'
 		},
@@ -110,61 +95,16 @@ export default {
 	},
 
 	methods: {
-		async accept() {
-			try {
-				await this.setParticipationStatus('ACCEPTED')
-				showSuccess(this.t('calendar', 'The invitation has been accepted successfully.'))
-				this.$emit('close')
-			} catch (e) {
-				showError(this.t('calendar', 'Failed to accept the invitation.'))
-			}
-		},
-
-		async decline() {
-			try {
-				await this.setParticipationStatus('DECLINED')
-				showSuccess(this.t('calendar', 'The invitation has been declined successfully.'))
-				this.$emit('close')
-			} catch (e) {
-				showError(this.t('calendar', 'Failed to decline the invitation.'))
-			}
+		accept() {
+			this.$emit('respond', 'ACCEPTED')
 		},
 
-		async tentative() {
-			try {
-				await this.setParticipationStatus('TENTATIVE')
-				showSuccess(this.t('calendar', 'Your participation has been marked as tentative.'))
-				this.$emit('close')
-			} catch (e) {
-				showError(this.t('calendar', 'Failed to set the participation status to tentative.'))
-			}
+		decline() {
+			this.$emit('respond', 'DECLINED')
 		},
 
-		/**
-		 * Set the participation status and save the event
-		 *
-		 * @param {string} participationStatus The new participation status
-		 * @return {Promise<void>}
-		 */
-		async setParticipationStatus(participationStatus) {
-			this.loading = true
-			try {
-				this.calendarObjectInstanceStore.changeAttendeesParticipationStatus({
-					attendee: this.attendee,
-					participationStatus,
-				})
-				// TODO: What about recurring events? Add new buttons like "Accept this and all future"?
-				// Currently, this will only accept a single occurrence.
-				await this.calendarObjectInstanceStore.saveCalendarObjectInstance({
-					thisAndAllFuture: false,
-					calendarId: this.calendarId,
-				})
-			} catch (error) {
-				logger.error('Failed to set participation status', { error, participationStatus })
-				throw error
-			} finally {
-				this.loading = false
-			}
+		tentative() {
+			this.$emit('respond', 'TENTATIVE')
 		},
 	},
 }
diff --git a/src/mixins/EditorMixin.js b/src/mixins/EditorMixin.js
index 3d3fe8aef5..c5f957c9d3 100644
--- a/src/mixins/EditorMixin.js
+++ b/src/mixins/EditorMixin.js
@@ -527,7 +527,30 @@ export default {
 			this.requiresActionOnRouteLeave = false
 			this.closeEditor()
 		},
-
+		/**
+		 * Set the participation status for an attendee and save the event
+		 *
+		 * @param {object} attendee The attendee object
+		 * @param {string} participationStatus The new participation status (ACCEPTED, DECLINED, TENTATIVE)
+		 * @return {Promise<void>}
+		 */
+		async saveParticipationStatus(attendee, participationStatus) {
+			try {
+				this.calendarObjectInstanceStore.changeAttendeesParticipationStatus({
+					attendee,
+					participationStatus,
+				})
+				// TODO: What about recurring events? Add new buttons like "Accept this and all future"?
+				// Currently, this will only accept a single occurrence.
+				await this.calendarObjectInstanceStore.saveCalendarObjectInstance({
+					thisAndAllFuture: false,
+					calendarId: this.calendarId,
+				})
+			} catch (error) {
+				logger.error('Failed to set participation status', { error, participationStatus })
+				throw error
+			}
+		},
 		/**
 		 * Duplicates a calendar-object and saves it
 		 *
diff --git a/src/views/EditFull.vue b/src/views/EditFull.vue
index 047b3e5bc3..f695488059 100644
--- a/src/views/EditFull.vue
+++ b/src/views/EditFull.vue
@@ -12,9 +12,13 @@
 		label-id="edit-full-modal"
 		:name="t('calendar', 'Edit event')"
 		:dark="false"
-		:no-close="true"
+		:no-close="operationInProgress"
 		@close="cancel(false)">
-		<NcButton class="calendar-edit-full__default-close" variant="tertiary" @click="cancel(false)">
+		<NcButton
+			class="calendar-edit-full__default-close"
+			variant="tertiary"
+			:disabled="operationInProgress"
+			@click="cancel(false)">
 			<template #icon>
 				<Close :size="20" />
 			</template>
@@ -162,7 +166,7 @@
 						:calendar-id="calendarId"
 						:narrow="true"
 						:grow-horizontally="true"
-						@close="closeEditorAndSkipAction" />
+						@respond="saveParticipationStatus" />
 				</div>
 
 				<div class="app-full-body">
@@ -325,6 +329,12 @@
 			:name="t('calendar', 'Discard changes?')"
 			:message="t('calendar', 'Are you sure you want to discard the changes made to this event?')"
 			:buttons="cancelButtons" />
+
+		<!-- Loading overlay - rendered last to appear on top -->
+		<div v-if="operationInProgress" class="edit-full__loading-overlay">
+			<NcLoadingIcon :size="64" />
+			<p>{{ operationMessage }}</p>
+		</div>
 	</NcModal>
 </template>
 
@@ -332,6 +342,8 @@
 import IconCancel from '@mdi/svg/svg/cancel.svg?raw'
 import IconDelete from '@mdi/svg/svg/delete.svg?raw'
 import { Parameter } from '@nextcloud/calendar-js'
+import { showError, showSuccess } from '@nextcloud/dialogs'
+import { translate as t } from '@nextcloud/l10n'
 import moment from '@nextcloud/moment'
 import { generateUrl } from '@nextcloud/router'
 import {
@@ -343,6 +355,7 @@ import {
 	NcDialog,
 	NcEmptyContent,
 	NcListItemIcon,
+	NcLoadingIcon,
 	NcModal,
 	NcPopover,
 } from '@nextcloud/vue'
@@ -392,6 +405,7 @@ export default {
 		NcEmptyContent,
 		NcModal,
 		NcListItemIcon,
+		NcLoadingIcon,
 		NcButton,
 		NcCheckboxRadioSwitch,
 		NcPopover,
@@ -447,6 +461,8 @@ export default {
 
 			showCancelDialog: false,
 			showFullModal: true,
+			operationInProgress: false,
+			operationMessage: '',
 		}
 	},
 
@@ -775,6 +791,77 @@ export default {
 
 			this.toggleAllDay()
 		},
+
+		/**
+		 * Override method to add operation locking
+		 *
+		 * @param {boolean} thisAndAllFuture Whether to modify only this or this and all future occurrences
+		 * @return {Promise<void>}
+		 */
+		async save(thisAndAllFuture = false) {
+			if (this.operationInProgress) {
+				return
+			}
+
+			this.operationInProgress = true
+			this.operationMessage = t('calendar', 'Saving event…')
+
+			try {
+				// Call the parent method from EditorMixin
+				await EditorMixin.methods.save.call(this, thisAndAllFuture)
+			} finally {
+				this.operationInProgress = false
+				this.operationMessage = ''
+			}
+		},
+
+		/**
+		 * Override method to add operation locking
+		 *
+		 * @param {boolean} thisAndAllFuture Whether to delete only this or this and all future occurrences
+		 * @return {Promise<void>}
+		 */
+		async delete(thisAndAllFuture = false) {
+			if (this.operationInProgress) {
+				return
+			}
+
+			this.operationInProgress = true
+			this.operationMessage = t('calendar', 'Deleting event…')
+
+			try {
+				await EditorMixin.methods.delete.call(this, thisAndAllFuture)
+				showSuccess(this.t('calendar', 'Event deleted successfully.'))
+				this.closeEditorAndSkipAction()
+			} catch (e) {
+				showError(this.t('calendar', 'Failed to delete event.'))
+			} finally {
+				this.operationInProgress = false
+				this.operationMessage = ''
+			}
+		},
+
+		/**
+		 * Override method to add operation locking
+		 *
+		 * @param {string} participationStatus The participation status (ACCEPTED, DECLINED, TENTATIVE)
+		 * @return {Promise<void>}
+		 */
+		async saveParticipationStatus(participationStatus) {
+			this.operationInProgress = true
+			this.operationMessage = t('calendar', 'Updating participation status…')
+
+			try {
+				await EditorMixin.methods.saveParticipationStatus.call(this, this.userAsAttendee, participationStatus)
+				showSuccess(this.t('calendar', 'Participation status updated successfully.'))
+				this.closeEditorAndSkipAction()
+			} catch (e) {
+				showError(this.t('calendar', 'Failed to update participation status.'))
+			} finally {
+				this.operationInProgress = false
+				this.operationMessage = ''
+			}
+		},
 	},
 }
 </script>
@@ -1084,4 +1171,35 @@ export default {
 	height: auto;
 	border-radius: var(--border-radius);
 }
+
+.edit-full__loading-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(var(--backdrop-color), 0.5);
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	gap: calc(var(--default-grid-baseline) * 4);
+	z-index: 10000;
+
+	p {
+		font-size: calc(var(--default-grid-baseline) * 4);
+		font-weight: 500;
+		color: var(--color-text-primary);
+		margin: 0;
+	}
+}
+
+
+
+.app-full__header__top-close-icon {
+	&.disabled {
+		opacity: 0.5;
+		cursor: not-allowed;
+	}
+}
 </style>
diff --git a/src/views/EditSimple.vue b/src/views/EditSimple.vue
index 6a2ac081a0..9c1bf59f22 100644
--- a/src/views/EditSimple.vue
+++ b/src/views/EditSimple.vue
@@ -37,7 +37,7 @@
 				<template v-else-if="isError">
 					<div class="event-popover__top-actions">
 						<Actions>
-							<ActionButton @click="cancel(false)">
+							<ActionButton :disabled="operationInProgress" @click="cancel(false)">
 								<template #icon>
 									<Close :size="20" decorative />
 								</template>
@@ -104,7 +104,7 @@
 							</ActionButton>
 						</Actions>
 						<Actions>
-							<ActionButton @click="cancel(false)">
+							<ActionButton :disabled="operationInProgress" @click="cancel(false)">
 								<template #icon>
 									<Close :size="20" decorative />
 								</template>
@@ -187,7 +187,7 @@
 							class="event-popover__response-buttons"
 							:attendee="userAsAttendee"
 							:calendar-id="calendarId"
-							@close="closeEditorAndSkipAction" />
+							@respond="saveParticipationStatus" />
 
 						<div v-if="isReadOnlyOrViewing && hasAlarms" class="property-alarm-wrapper">
 							<Bell :size="20" class="property-alarm-icon" />
@@ -215,6 +215,7 @@
 							<NcButton
 								v-if="!isReadOnly && isViewing"
 								:variant="isViewedByAttendee ? 'tertiary' : undefined"
+								:disabled="operationInProgress"
 								@click="isViewing = false">
 								<template #icon>
 									<EditIcon :size="20" />
@@ -224,6 +225,12 @@
 						</SaveButtons>
 					</div>
 				</template>
+
+				<!-- Loading overlay - rendered last to appear on top -->
+				<div v-if="operationInProgress" class="edit-simple__loading-overlay">
+					<NcLoadingIcon :size="64" />
+					<p>{{ operationMessage }}</p>
+				</div>
 			</div>
 		</div>
 		<NcDialog
@@ -238,13 +245,16 @@
 <script>
 import IconCancel from '@mdi/svg/svg/cancel.svg?raw'
 import IconDelete from '@mdi/svg/svg/delete.svg?raw'
+import { showError, showSuccess } from '@nextcloud/dialogs'
 import {
 	NcActionButton as ActionButton,
 	NcActionLink as ActionLink,
 	NcActions as Actions,
 	NcEmptyContent as EmptyContent,
 	NcButton,
-	NcCheckboxRadioSwitch, NcDialog,
+	NcCheckboxRadioSwitch,
+	NcDialog,
+	NcLoadingIcon,
 	NcPopover,
 } from '@nextcloud/vue'
 import { mapState, mapStores } from 'pinia'
@@ -299,6 +309,7 @@ export default {
 		EditIcon,
 		HelpCircleIcon,
 		NcDialog,
+		NcLoadingIcon,
 	},
 
 	mixins: [
@@ -328,6 +339,8 @@ export default {
 			isViewing: true,
 			closeMask: false,
 			showCancelDialog: false,
+			operationInProgress: false,
+			operationMessage: '',
 			cancelButtons: [
 				{
 					label: t('calendar', 'Discard event'),
@@ -761,6 +774,28 @@ export default {
 			}
 		},
 
+		/**
+		 * Respond to an invitation
+		 *
+		 * @param {string} participationStatus The participation status (ACCEPTED, DECLINED, TENTATIVE)
+		 * @return {Promise<void>}
+		 */
+		async saveParticipationStatus(participationStatus) {
+			this.operationInProgress = true
+			this.operationMessage = t('calendar', 'Updating participation status…')
+
+			try {
+				await EditorMixin.methods.saveParticipationStatus.call(this, this.userAsAttendee, participationStatus)
+				showSuccess(this.t('calendar', 'Participation status updated successfully.'))
+				this.closeEditorAndSkipAction()
+			} catch (e) {
+				showError(this.t('calendar', 'Failed to update participation status.'))
+			} finally {
+				this.operationInProgress = false
+				this.operationMessage = ''
+			}
+		},
+
 		/**
 		 * Toggles the all-day state of an event
 		 */
@@ -893,4 +928,26 @@ export default {
 	align-items: center;
 }
 
+.edit-simple__loading-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(var(--backdrop-color), 0.5);
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	gap: calc(var(--default-grid-baseline) * 4);
+	z-index: 10000;
+	border-radius: var(--border-radius-large);
+
+	p {
+		margin: 0;
+		font-weight: 500;
+		color: var(--color-main-text);
+	}
+}
+
 </style>