diff --git a/core/css/header.scss b/core/css/header.scss
index c83a98646feef..9d6e414ff2e32 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -147,6 +147,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..0893fdd9ffecb 100644
--- a/core/css/mobile.scss
+++ b/core/css/mobile.scss
@@ -134,7 +134,7 @@
 }
 
 @media only screen and (max-width: 480px) {
-	#header .header-end > div > .menu {
+	#header .header-end .menu {
 		max-width: calc(100vw - 10px);
 		position: fixed;
 		&::after {
@@ -142,7 +142,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/components/UnifiedSearch/UnifiedSearchLocalSearchBar.vue b/core/src/components/UnifiedSearch/UnifiedSearchLocalSearchBar.vue
index 602f3340c8e50..b41a12314a0b0 100644
--- a/core/src/components/UnifiedSearch/UnifiedSearchLocalSearchBar.vue
+++ b/core/src/components/UnifiedSearch/UnifiedSearchLocalSearchBar.vue
@@ -162,7 +162,8 @@ function clearAndCloseSearch() {
 		inset-inline: 0;
 	}
 	// Hide all other entries, especially the user menu as it might leak pixels
-	:global(.header-end:has(.local-unified-search--open) > :not(.unified-search-menu)) {
+	:global(.header-end:has(.local-unified-search--open) > :not(.unified-search-menu)),
+	:global(.header-end:has(.local-unified-search--open) .header-end__item:not(:has(.local-unified-search--open))) {
 		display: none;
 	}
 }
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index f5afb020f6691..a0604bf429ee8 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('User menu')); ?>">
+				<ul class="header-end__items">
+					<li class="header-end__item">
+						<div id="notifications"></div>
+					</li>
+					<li class="header-end__item">
+						<div id="contactsmenu"></div>
+					</li>
+					<li class="header-end__item">
+						<div id="user-menu"></div>
+					</li>
+				</ul>
+			</nav>
 		</header>
 
 		<div id="content" class="app-<?php p($_['appid']) ?>">