diff --git a/package-lock.json b/package-lock.json
index c7586a8837..e796126bc0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,6 @@
 				"@nextcloud/capabilities": "^1.0.4",
 				"@nextcloud/dialogs": "^3.1.4",
 				"@nextcloud/event-bus": "^3.0.0",
-				"@nextcloud/focus-trap": "^0.1.0-beta",
 				"@nextcloud/initial-state": "^2.0.0",
 				"@nextcloud/l10n": "^1.6.0",
 				"@nextcloud/logger": "^2.2.1",
@@ -25,6 +24,7 @@
 				"emoji-mart-vue-fast": "^11.1.1",
 				"escape-html": "^1.0.3",
 				"floating-vue": "^1.0.0-beta.18",
+				"focus-trap": "^7.1.0",
 				"hammerjs": "^2.0.8",
 				"linkify-string": "^4.0.0",
 				"md5": "^2.3.0",
@@ -4995,18 +4995,6 @@
 			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
 			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
 		},
-		"node_modules/@nextcloud/focus-trap": {
-			"version": "0.1.0-beta",
-			"resolved": "https://registry.npmjs.org/@nextcloud/focus-trap/-/focus-trap-0.1.0-beta.tgz",
-			"integrity": "sha512-c6mrUrvDGRVkYfUGAJl7o2lxA/iIMF46XgBdCGCnCJFISFqHoWYGQoG6adc6w2IL7uhGka+lzy38szz+WUYpkA==",
-			"dependencies": {
-				"focus-trap": "^7.0.0"
-			},
-			"engines": {
-				"node": "^16.0.0",
-				"npm": "^7.0.0 || ^8.0.0"
-			}
-		},
 		"node_modules/@nextcloud/initial-state": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-2.0.0.tgz",
@@ -7972,14 +7960,20 @@
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001317",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001317.tgz",
-			"integrity": "sha512-xIZLh8gBm4dqNX0gkzrBeyI86J2eCjWzYAs40q88smG844YIrN4tVQl/RhquHvKEKImWWFIVh1Lxe5n1G/N+GQ==",
+			"version": "1.0.30001431",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz",
+			"integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==",
 			"dev": true,
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/browserslist"
-			}
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+				}
+			]
 		},
 		"node_modules/caseless": {
 			"version": "0.12.0",
@@ -12480,11 +12474,11 @@
 			}
 		},
 		"node_modules/focus-trap": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.0.0.tgz",
-			"integrity": "sha512-uT4Bl8TwU+5vVAx/DHil/1eVS54k9unqhK/vGy2KSh7esPmqgC0koAB9J2sJ+vtj8+vmiFyGk2unLkhNLQaxoA==",
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.1.0.tgz",
+			"integrity": "sha512-CuJvwUBfJCWcU6fc4xr3UwMF5vWnox4isXAixCwrPzCsPKOQjP9T+nTlYT2t+vOmQL8MOQ16eim99XhjQHAuiQ==",
 			"dependencies": {
-				"tabbable": "^6.0.0"
+				"tabbable": "^6.0.1"
 			}
 		},
 		"node_modules/follow-redirects": {
@@ -25714,9 +25708,9 @@
 			"dev": true
 		},
 		"node_modules/tabbable": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.0.0.tgz",
-			"integrity": "sha512-SxhZErfHc3Yozz/HLAl/iPOxuIj8AtUw13NRewVOjFW7vbsqT1f3PuiHrPQbUkRcLNEgAedAv2DnjLtzynJXiw=="
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.0.1.tgz",
+			"integrity": "sha512-SYJSIgeyXW7EuX1ytdneO5e8jip42oHWg9xl/o3oTYhmXusZVgiA+VlPvjIN+kHii9v90AmzTZEBcsEvuAY+TA=="
 		},
 		"node_modules/table": {
 			"version": "6.8.0",
@@ -33324,14 +33318,6 @@
 				}
 			}
 		},
-		"@nextcloud/focus-trap": {
-			"version": "0.1.0-beta",
-			"resolved": "https://registry.npmjs.org/@nextcloud/focus-trap/-/focus-trap-0.1.0-beta.tgz",
-			"integrity": "sha512-c6mrUrvDGRVkYfUGAJl7o2lxA/iIMF46XgBdCGCnCJFISFqHoWYGQoG6adc6w2IL7uhGka+lzy38szz+WUYpkA==",
-			"requires": {
-				"focus-trap": "^7.0.0"
-			}
-		},
 		"@nextcloud/initial-state": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-2.0.0.tgz",
@@ -35735,9 +35721,9 @@
 			}
 		},
 		"caniuse-lite": {
-			"version": "1.0.30001317",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001317.tgz",
-			"integrity": "sha512-xIZLh8gBm4dqNX0gkzrBeyI86J2eCjWzYAs40q88smG844YIrN4tVQl/RhquHvKEKImWWFIVh1Lxe5n1G/N+GQ==",
+			"version": "1.0.30001431",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz",
+			"integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==",
 			"dev": true
 		},
 		"caseless": {
@@ -39219,11 +39205,11 @@
 			}
 		},
 		"focus-trap": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.0.0.tgz",
-			"integrity": "sha512-uT4Bl8TwU+5vVAx/DHil/1eVS54k9unqhK/vGy2KSh7esPmqgC0koAB9J2sJ+vtj8+vmiFyGk2unLkhNLQaxoA==",
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.1.0.tgz",
+			"integrity": "sha512-CuJvwUBfJCWcU6fc4xr3UwMF5vWnox4isXAixCwrPzCsPKOQjP9T+nTlYT2t+vOmQL8MOQ16eim99XhjQHAuiQ==",
 			"requires": {
-				"tabbable": "^6.0.0"
+				"tabbable": "^6.0.1"
 			}
 		},
 		"follow-redirects": {
@@ -49362,9 +49348,9 @@
 			"dev": true
 		},
 		"tabbable": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.0.0.tgz",
-			"integrity": "sha512-SxhZErfHc3Yozz/HLAl/iPOxuIj8AtUw13NRewVOjFW7vbsqT1f3PuiHrPQbUkRcLNEgAedAv2DnjLtzynJXiw=="
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.0.1.tgz",
+			"integrity": "sha512-SYJSIgeyXW7EuX1ytdneO5e8jip42oHWg9xl/o3oTYhmXusZVgiA+VlPvjIN+kHii9v90AmzTZEBcsEvuAY+TA=="
 		},
 		"table": {
 			"version": "6.8.0",
diff --git a/package.json b/package.json
index d3b1d67ec3..9994f4c3e2 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,6 @@
 		"@nextcloud/capabilities": "^1.0.4",
 		"@nextcloud/dialogs": "^3.1.4",
 		"@nextcloud/event-bus": "^3.0.0",
-		"@nextcloud/focus-trap": "^0.1.0-beta",
 		"@nextcloud/initial-state": "^2.0.0",
 		"@nextcloud/l10n": "^1.6.0",
 		"@nextcloud/logger": "^2.2.1",
@@ -55,6 +54,7 @@
 		"emoji-mart-vue-fast": "^11.1.1",
 		"escape-html": "^1.0.3",
 		"floating-vue": "^1.0.0-beta.18",
+		"focus-trap": "^7.1.0",
 		"hammerjs": "^2.0.8",
 		"linkify-string": "^4.0.0",
 		"md5": "^2.3.0",
diff --git a/src/components/NcModal/NcModal.vue b/src/components/NcModal/NcModal.vue
index 24bb39ab91..f8836c27c4 100644
--- a/src/components/NcModal/NcModal.vue
+++ b/src/components/NcModal/NcModal.vue
@@ -21,7 +21,6 @@
   -->
 
 <docs>
-
 ```vue
 <template>
 	<div>
@@ -38,13 +37,6 @@
 		</NcModal>
 	</div>
 </template>
-<style scoped>
-.modal__content {
-	margin: 50px;
-	text-align: center;
-}
-
-</style>
 <script>
 export default {
 	data() {
@@ -62,6 +54,12 @@ export default {
 	}
 }
 </script>
+<style scoped>
+.modal__content {
+	margin: 50px;
+	text-align: center;
+}
+</style>
 ```
 
 ### Modal with more properties
@@ -125,9 +123,7 @@ export default {
 .input-field {
 	margin: 12px 0px;
 }
-
 </style>
-
 ```
 
 ### Usage of popover in modal
@@ -145,12 +141,6 @@ export default {
 		</NcModal>
 	</div>
 </template>
-<style scoped>
-	.modal__content {
-		margin: 50px;
-		text-align: center;
-	}
-</style>
 <script>
 export default {
 	data() {
@@ -172,6 +162,12 @@ export default {
 	},
 }
 </script>
+<style scoped>
+.modal__content {
+	margin: 50px;
+	text-align: center;
+}
+</style>
 ```
 </docs>
 
@@ -310,13 +306,14 @@ export default {
 </template>
 
 <script>
-import NcActions from '../NcActions/index.js'
-import Tooltip from '../../directives/Tooltip/index.js'
-import l10n from '../../mixins/l10n.js'
-import Timer from '../../utils/Timer.js'
+import { getTrapStack } from '../../utils/focusTrap.js'
 import { t } from '../../l10n.js'
-import NcButton from '../../components/NcButton/index.js'
 import GenRandomId from '../../utils/GenRandomId.js'
+import l10n from '../../mixins/l10n.js'
+import NcActions from '../NcActions/index.js'
+import NcButton from '../../components/NcButton/index.js'
+import Timer from '../../utils/Timer.js'
+import Tooltip from '../../directives/Tooltip/index.js'
 
 import ChevronLeft from 'vue-material-design-icons/ChevronLeft.vue'
 import ChevronRight from 'vue-material-design-icons/ChevronRight.vue'
@@ -324,8 +321,9 @@ import Close from 'vue-material-design-icons/Close.vue'
 import Pause from 'vue-material-design-icons/Pause.vue'
 import Play from 'vue-material-design-icons/Play.vue'
 
+import { createFocusTrap } from 'focus-trap'
 import Hammer from 'hammerjs'
-import { createFocusTrap } from '@nextcloud/focus-trap'
+
 export default {
 	name: 'NcModal',
 
@@ -689,8 +687,10 @@ export default {
 			const contentContainer = this.$refs.mask
 			// wait until all children are mounted and available in the DOM before focusTrap can be added
 			this.$nextTick(() => {
+				// Init focus trap
 				this.focusTrap = createFocusTrap(contentContainer, {
 					allowOutsideClick: true,
+					trapStack: getTrapStack(),
 				})
 				this.focusTrap.activate()
 			})
diff --git a/src/components/NcPopover/NcPopover.vue b/src/components/NcPopover/NcPopover.vue
index ce6ca4068c..c44dcb7f95 100644
--- a/src/components/NcPopover/NcPopover.vue
+++ b/src/components/NcPopover/NcPopover.vue
@@ -102,7 +102,8 @@ The prop `:focus-trap="false"` help to prevent it when the default behavior is n
 
 <script>
 import { Dropdown } from 'floating-vue'
-import { createFocusTrap } from '@nextcloud/focus-trap'
+import { createFocusTrap } from 'focus-trap'
+import { getTrapStack } from '../../utils/focusTrap.js'
 
 export default {
 	name: 'NcPopover',
@@ -155,11 +156,13 @@ export default {
 				return
 			}
 
+			// Init focus trap
 			this.$focusTrap = createFocusTrap(el, {
 				// Prevents to lose focus using esc key
 				// Focus will be release when popover be hide
 				escapeDeactivates: false,
 				allowOutsideClick: true,
+				trapStack: getTrapStack(),
 			})
 			this.$focusTrap.activate()
 		},
diff --git a/src/utils/focusTrap.js b/src/utils/focusTrap.js
new file mode 100644
index 0000000000..dabf2203b5
--- /dev/null
+++ b/src/utils/focusTrap.js
@@ -0,0 +1,35 @@
+/**
+ * @copyright Copyright (c) 2022 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+// eslint-disable-next-line import/named
+import { FocusTrap } from 'focus-trap'
+
+/**
+ * Return the default global focus trap stack
+ *
+ * @return {FocusTrap[]}
+ */
+export const getTrapStack = function() {
+	// Create global stack if undefined
+	Object.assign(window, { _nc_focus_trap: window._nc_focus_trap || [] })
+
+	return window._nc_focus_trap
+}