From 4551f671cedb98f16513a38a422cf80b08e15a54 Mon Sep 17 00:00:00 2001
From: kristian-zendato <kristian.zendato@nextcloud.com>
Date: Thu, 20 Aug 2026 17:51:08 +0000
Subject: [PATCH] fix: make top nav bar right elements within a nav

Signed-off-by: kristian-zendato <kristian.zendato@nextcloud.com>
---
 core/css/header.scss           | 15 +++++++++++++++
 core/css/mobile.scss           |  6 ++++--
 core/src/views/AccountMenu.vue |  1 -
 core/templates/layout.user.php | 18 +++++++++++++-----
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/core/css/header.scss b/core/css/header.scss
index 028312b0f8f0d..255d51bf9e81b 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -157,6 +157,21 @@
 				flex: 1 0;
 			}
 		}
+
+		// List wrapper for notifications / contacts / account (and injected entries)
+		&__items {
+			display: inline-flex;
+			align-items: center;
+			justify-content: flex-end;
+			list-style: none;
+			margin: 0;
+			padding: 0;
+		}
+
+		&__item {
+			display: flex;
+			align-items: center;
+		}
 	}
 
 	// Public layout related headers
diff --git a/core/css/mobile.scss b/core/css/mobile.scss
index 5495df2316ff2..c7a3c36c74753 100644
--- a/core/css/mobile.scss
+++ b/core/css/mobile.scss
@@ -134,7 +134,8 @@
 }
 
 @media only screen and (max-width: 480px) {
-	#header .header-end > div > .menu {
+	#header .header-end > div > .menu,
+	#header .header-end__item > div > .menu {
 		max-width: calc(100vw - 10px);
 		position: fixed;
 		&::after {
@@ -142,7 +143,8 @@
 		}
 	}
 	/* Arrow directly child of menutoggle */
-	#header .header-end > div {
+	#header .header-end > div,
+	#header .header-end__item > div {
 		&.openedMenu {
 			&::after {
 				display: block;
diff --git a/core/src/views/AccountMenu.vue b/core/src/views/AccountMenu.vue
index feacfb74ecab0..ae0417b26b2f4 100644
--- a/core/src/views/AccountMenu.vue
+++ b/core/src/views/AccountMenu.vue
@@ -6,7 +6,6 @@
 	<NcHeaderMenu
 		id="user-menu"
 		class="account-menu"
-		is-nav
 		:aria-label="t('core', 'Settings menu')"
 		:description="avatarDescription">
 		<template #trigger>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index f5afb020f6691..1604ab8ac3d41 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -75,11 +75,19 @@
 			<div class="header-center">
 				<div id="unified-search"></div>
 			</div>
-			<div class="header-end">
-				<div id="notifications"></div>
-				<div id="contactsmenu"></div>
-				<div id="user-menu"></div>
-			</div>
+			<nav class="header-end" aria-label="<?php p($l->t('Header menu')); ?>">
+				<ul class="header-end__items" role="menubar">
+					<li class="header-end__item" role="none">
+						<div id="notifications"></div>
+					</li>
+					<li class="header-end__item" role="none">
+						<div id="contactsmenu"></div>
+					</li>
+					<li class="header-end__item" role="none">
+						<div id="user-menu"></div>
+					</li>
+				</ul>
+			</nav>
 		</header>
 
 		<div id="content" class="app-<?php p($_['appid']) ?>">