From a66e5d0ed679e07b31d0a6e0d8f0d005498d5a4d Mon Sep 17 00:00:00 2001
From: uinstinct <61635505+uinstinct@users.noreply.github.com>
Date: Thu, 9 Oct 2025 18:02:38 +0530
Subject: [PATCH 1/2] fix: open hub org settings

---
 .../config/sections/OrganizationsSection.tsx    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/gui/src/pages/config/sections/OrganizationsSection.tsx b/gui/src/pages/config/sections/OrganizationsSection.tsx
index e43aec7bdef..3ca0c8442e6 100644
--- a/gui/src/pages/config/sections/OrganizationsSection.tsx
+++ b/gui/src/pages/config/sections/OrganizationsSection.tsx
@@ -1,5 +1,6 @@
 import { Cog6ToothIcon } from "@heroicons/react/24/outline";
 import { BuildingOfficeIcon, UserIcon } from "@heroicons/react/24/solid";
+import { SerializedOrgWithProfiles } from "core/config/ProfileLifecycleManager";
 import { isOnPremSession } from "core/control-plane/AuthTypes";
 import { useContext } from "react";
 import { Button, Card, Divider } from "../../../components/ui";
@@ -30,14 +31,20 @@ export function OrganizationsSection() {
     session && organizations.length > 1 && !isOnPremSession(session);
 
   function handleAddOrganization() {
-    ideMessenger.request("controlPlane/openUrl", {
+    void ideMessenger.request("controlPlane/openUrl", {
       path: "/organizations/new",
     });
   }
 
-  function handleConfigureOrganization(orgId: string) {
-    ideMessenger.request("controlPlane/openUrl", {
-      path: `/organizations/${orgId}/settings`,
+  function handleConfigureOrganization(org: SerializedOrgWithProfiles) {
+    let path: string;
+    if (org.id === "personal") {
+      path = "/settings";
+    } else {
+      path = `/organizations/${org.slug}/settings`;
+    }
+    void ideMessenger.request("controlPlane/openUrl", {
+      path,
     });
   }
 
@@ -82,7 +89,7 @@ export function OrganizationsSection() {
                 </div>
               </div>
               <Button
-                onClick={() => handleConfigureOrganization(organization.id)}
+                onClick={() => handleConfigureOrganization(organization)}
                 variant="ghost"
                 size="sm"
                 className="text-description-muted hover:enabled:text-foreground my-0 h-6 w-6 p-0"

From f2acdb2d4ed865172f315e27e69ecbb4ef73dbbd Mon Sep 17 00:00:00 2001
From: uinstinct <61635505+uinstinct@users.noreply.github.com>
Date: Fri, 10 Oct 2025 08:50:00 +0530
Subject: [PATCH 2/2] also check if slug is undefined

---
 gui/src/pages/config/sections/OrganizationsSection.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/src/pages/config/sections/OrganizationsSection.tsx b/gui/src/pages/config/sections/OrganizationsSection.tsx
index 3ca0c8442e6..f7c1258a67a 100644
--- a/gui/src/pages/config/sections/OrganizationsSection.tsx
+++ b/gui/src/pages/config/sections/OrganizationsSection.tsx
@@ -38,7 +38,7 @@ export function OrganizationsSection() {
 
   function handleConfigureOrganization(org: SerializedOrgWithProfiles) {
     let path: string;
-    if (org.id === "personal") {
+    if (org.id === "personal" || org.slug === undefined) {
       path = "/settings";
     } else {
       path = `/organizations/${org.slug}/settings`;