diff --git a/core/css/header.scss b/core/css/header.scss
index f21ea815b3c..8e576113246 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -32,6 +32,9 @@
 	}
 
 	.header-right {
+		// Add some spacing so the last entry looks ok
+		margin-inline-end: calc(3 * var(--default-grid-baseline));
+
 		a:not(.button):focus-visible::after, div[role=button]:focus-visible::after {
 			bottom: 4px;
 		}
diff --git a/core/src/views/UserMenu.vue b/core/src/views/UserMenu.vue
index de6cac51165..1351743dd05 100644
--- a/core/src/views/UserMenu.vue
+++ b/core/src/views/UserMenu.vue
@@ -157,8 +157,6 @@ export default {
 
 <style lang="scss" scoped>
 .user-menu {
-	margin-right: 12px;
-
 	&:deep {
 		.header-menu {
 			&__trigger {