From 788eeae50071276667d2f504d6513abac7120ac1 Mon Sep 17 00:00:00 2001
From: Nawaz Dhandala <hello@nawazdhandala.com>
Date: Fri, 3 Apr 2026 14:23:04 +0100
Subject: [PATCH] fix: remove duplicate project selection callback in
 DashboardProjectPicker

---
 .../Dashboard/src/Components/Header/ProjectPicker.tsx          | 3 ---
 Common/UI/Utils/Navigation.ts                                  | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/App/FeatureSet/Dashboard/src/Components/Header/ProjectPicker.tsx b/App/FeatureSet/Dashboard/src/Components/Header/ProjectPicker.tsx
index 9c6ab569cc..9c3ac164ec 100644
--- a/App/FeatureSet/Dashboard/src/Components/Header/ProjectPicker.tsx
+++ b/App/FeatureSet/Dashboard/src/Components/Header/ProjectPicker.tsx
@@ -284,9 +284,6 @@ const DashboardProjectPicker: FunctionComponent<ComponentProps> = (
             if (project && props.onProjectSelected) {
               props.onProjectSelected(project);
             }
-            if (project && props.onProjectSelected) {
-              props.onProjectSelected(project);
-            }
             setShowModal(false);
             props.onProjectModalClose();
           }}
diff --git a/Common/UI/Utils/Navigation.ts b/Common/UI/Utils/Navigation.ts
index 9a204dccd0..f97b06973e 100644
--- a/Common/UI/Utils/Navigation.ts
+++ b/Common/UI/Utils/Navigation.ts
@@ -231,6 +231,7 @@ abstract class Navigation {
 
     if (options?.forceNavigate && to instanceof Route) {
       window.location.href = finalUrl;
+      return;
     }
 
     if (this.navigateHook && to instanceof Route && !this.isOnThisPage(to)) {