diff --git a/src/components/NcModal/NcModal.vue b/src/components/NcModal/NcModal.vue
index f98f9a4f26..6bf309592f 100644
--- a/src/components/NcModal/NcModal.vue
+++ b/src/components/NcModal/NcModal.vue
@@ -717,7 +717,7 @@ export default {
 			}
 
 			// Init focus trap
-			this.focusTrap = createFocusTrap(contentContainer, options)
+			this.focusTrap = createFocusTrap([contentContainer, ...this.additionalTrapElements], options)
 			this.focusTrap.activate()
 		},
 		clearFocusTrap() {