diff --git a/apps/app/src/components/organization-switcher.tsx b/apps/app/src/components/organization-switcher.tsx
index 69c7c4ebf..f77315f82 100644
--- a/apps/app/src/components/organization-switcher.tsx
+++ b/apps/app/src/components/organization-switcher.tsx
@@ -183,7 +183,8 @@ export function OrganizationSwitcher({
                 {organizations.map((org) => (
                   <CommandItem
                     key={org.id}
-                    value={org.id}
+                    // Search by id and name
+                    value={`${org.id} ${org.name || ''}`}
                     onSelect={() => {
                       if (org.id !== currentOrganization?.id) {
                         handleOrgChange(org);