diff --git a/.eslintrc.js b/.eslintrc.js
index 5989476b16..14fee57dc4 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -22,7 +22,6 @@ module.exports = {
 		'src/components/NcBreadcrumb*/*.vue',
 		'src/components/NcContent/*.vue',
 		'src/components/NcDashboard*/*.vue',
-		'src/components/NcHeaderMenu*/*.vue',
 		'src/components/NcRelatedResourcesPanel*/*.vue',
 		'src/components/NcRich*/**/*.vue',
 		'src/components/NcUserBubble*/*.vue',
diff --git a/src/components/NcHeaderMenu/NcHeaderMenu.vue b/src/components/NcHeaderMenu/NcHeaderMenu.vue
index 6640e6af0a..5aa88e359f 100644
--- a/src/components/NcHeaderMenu/NcHeaderMenu.vue
+++ b/src/components/NcHeaderMenu/NcHeaderMenu.vue
@@ -215,7 +215,7 @@ export default {
 	mounted() {
 		document.addEventListener('keydown', this.onKeyDown)
 	},
-	beforeDestroy() {
+	beforeUnmount() {
 		document.removeEventListener('keydown', this.onKeyDown)
 	},
 
diff --git a/src/components/index.js b/src/components/index.js
index 35f59f8429..3ca70ab648 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -68,7 +68,7 @@ export { default as NcDialogButton } from './NcDialogButton/index.js'
 export { default as NcEmojiPicker } from './NcEmojiPicker/index.js'
 export { default as NcEmptyContent } from './NcEmptyContent/index.js'
 export { default as NcGuestContent } from './NcGuestContent/index.js'
-// export { default as NcHeaderMenu } from './NcHeaderMenu/index.js'
+export { default as NcHeaderMenu } from './NcHeaderMenu/index.js'
 export { default as NcHighlight } from './NcHighlight/index.js'
 export { default as NcIconSvgWrapper } from './NcIconSvgWrapper/index.js'
 // Not exported on purpose as it is only meant as a base component
diff --git a/styleguide.config.js b/styleguide.config.js
index aa528fff05..4118ab538f 100644
--- a/styleguide.config.js
+++ b/styleguide.config.js
@@ -118,7 +118,6 @@ module.exports = async () => {
 					'src/components/NcUserBubble/NcUserBubbleDiv.vue',
 
 					// Not yet adjusted for vue3
-					'src/components/NcHeaderMenu*/*.vue',
 					'src/components/NcRelatedResourcesPanel*/*.vue',
 					'src/components/NcRichContenteditable*/*.vue',
 					'src/components/NcUserBubble*/*.vue',