From c861b1adaaa894d752a2088f1a77b35a22eec2ac Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Tue, 3 Nov 2026 20:11:29 +0100
Subject: [PATCH] Bugfix/flickering of navigation items in header (#8375)

* Fix flickering of navigation items in header

* Update changelog
---
 CHANGELOG.md                                                | 4 ++++
 apps/client/src/app/components/header/header.component.html | 5 ++++-
 apps/client/src/app/components/header/header.component.ts   | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dac611ca2..acc7d889f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Improved the content of the pricing page
 
+### Fixed
+
+- Fixed the flickering of the navigation items in the header for logged-in users
+
 ## 3.97.0 - 2026-11-02
 
 ### Changed
diff --git a/apps/client/src/app/components/header/header.component.html b/apps/client/src/app/components/header/header.component.html
index 05dacf8d37..0d35d7e23a 100644
--- a/apps/client/src/app/components/header/header.component.html
+++ b/apps/client/src/app/components/header/header.component.html
@@ -339,7 +339,10 @@
       </a>
     </div>
     <span class="gf-spacer"></span>
-    <ul class="align-items-center d-flex list-inline m-0 px-2">
+    <ul
+      class="align-items-center d-flex list-inline m-0 px-2"
+      [class.invisible]="isInitialNavigationPending"
+    >
       <li class="list-inline-item">
         <a
           class="d-none d-sm-block rounded"
diff --git a/apps/client/src/app/components/header/header.component.ts b/apps/client/src/app/components/header/header.component.ts
index d4a2fdbabc..a274e6c417 100644
--- a/apps/client/src/app/components/header/header.component.ts
+++ b/apps/client/src/app/components/header/header.component.ts
@@ -105,6 +105,7 @@ export class GfHeaderComponent implements OnChanges {
   protected hasPermissionToCreateUser: boolean;
   protected impersonationId: string | null;
   protected readonly internalRoutes = internalRoutes;
+  protected isInitialNavigationPending: boolean;
   protected isMenuOpen: boolean;
   protected readonly routeAbout = publicRoutes.about.path;
   protected readonly routeFeatures = publicRoutes.features.path;
@@ -214,6 +215,9 @@ export class GfHeaderComponent implements OnChanges {
       this.info()?.globalPermissions,
       permissions.createUserAccount
     );
+
+    this.isInitialNavigationPending =
+      !this.currentRoute() && !!this.tokenStorageService.getToken();
   }
 
   protected closeAssistant() {