diff --git a/shell/app/org-home/stores/org.tsx b/shell/app/org-home/stores/org.tsx
index bbb06d55f0..09aa84dd86 100644
--- a/shell/app/org-home/stores/org.tsx
+++ b/shell/app/org-home/stores/org.tsx
@@ -103,7 +103,7 @@ const org = createStore({
           }
         }
         if (currentOrg.name !== orgName) {
-          location.href = location.href.replace(`/${orgName}/`, `/${currentOrg.name}/`);
+          location.href = location.href.replace(`/${orgName}`, `/${currentOrg.name}`); // just replace the first match, which is org name
           return;
         }
         if (orgId) {