diff --git a/src/components/NcButton/NcButton.vue b/src/components/NcButton/NcButton.vue
index 961544a1a0..eaef329e6b 100644
--- a/src/components/NcButton/NcButton.vue
+++ b/src/components/NcButton/NcButton.vue
@@ -440,9 +440,9 @@ export default {
 	name: 'NcButton',
 
 	inject: {
-		ncPopoverTriggerAttrs: {
+		getNcPopoverTriggerAttrs: {
 			from: 'NcPopover:trigger:attrs',
-			default: () => ({}),
+			default: () => () => ({}),
 		},
 	},
 
@@ -600,6 +600,10 @@ export default {
 		isReverseAligned() {
 			return this.alignment.includes('-')
 		},
+
+		ncPopoverTriggerAttrs() {
+			return this.getNcPopoverTriggerAttrs()
+		},
 	},
 
 	/**
diff --git a/src/components/NcPopover/NcPopover.vue b/src/components/NcPopover/NcPopover.vue
index 336c75c2de..d3004776c5 100644
--- a/src/components/NcPopover/NcPopover.vue
+++ b/src/components/NcPopover/NcPopover.vue
@@ -157,13 +157,14 @@ See: https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/
 
 <template>
 	<Dropdown ref="popover"
-		:shown.sync="shownProxy"
 		:distance="10"
 		:arrow-padding="10"
 		v-bind="$attrs"
 		:no-auto-focus="true /* Handled by the focus trap */"
 		:popper-class="popoverBaseClass"
+		:shown="internalShown"
 		v-on="$listeners"
+		@update:shown="internalShown = $event"
 		@apply-show="afterShow"
 		@apply-hide="afterHide">
 		<NcPopoverTriggerProvider v-slot="slotProps" :shown="internalShown" :popup-role="popupRole">
@@ -252,22 +253,14 @@ export default {
 		}
 	},
 
-	computed: {
-		shownProxy: {
-			get() {
-				return this.shown
-			},
-			set(value) {
-				this.internalShown = value
-				this.$emit('update:shown', value)
-			},
-		},
-	},
-
 	watch: {
 		shown(value) {
 			this.internalShown = value
 		},
+
+		internalShown(value) {
+			this.$emit('update:shown', value)
+		},
 	},
 
 	mounted() {
diff --git a/src/components/NcPopover/NcPopoverTriggerProvider.vue b/src/components/NcPopover/NcPopoverTriggerProvider.vue
index fa2682ddcf..5d4be98708 100644
--- a/src/components/NcPopover/NcPopoverTriggerProvider.vue
+++ b/src/components/NcPopover/NcPopoverTriggerProvider.vue
@@ -6,8 +6,8 @@ export default defineComponent({
 
 	provide() {
 		return {
-			'NcPopover:trigger:shown': computed(() => this.shown),
-			'NcPopover:trigger:attrs': computed(() => this.triggerAttrs),
+			'NcPopover:trigger:shown': () => this.shown,
+			'NcPopover:trigger:attrs': () => this.triggerAttrs,
 		}
 	},