diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.html
index 5e641b1c52..bf94bdaea4 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.html
@@ -10,7 +10,9 @@
   <i
     slot="end"
     *ngIf="!activeOrganization.enabled"
-    class="bwi bwi-exclamation-triangle tw-my-auto !tw-text-danger"
+    class="bwi bwi-exclamation-triangle tw-my-auto !text-alt-2"
+    [attr.aria-label]="'organizationIsDisabled' | i18n"
+    appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
   ></i>
   <ng-container *ngIf="organizations$ | async as organizations">
     <bit-nav-item
@@ -24,7 +26,9 @@
       <i
         slot="end"
         *ngIf="org.enabled == false"
-        class="bwi bwi-exclamation-triangle !tw-text-danger"
+        class="bwi bwi-exclamation-triangle !text-alt-2"
+        [attr.aria-label]="'organizationIsDisabled' | i18n"
+        appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
       ></i>
     </bit-nav-item>
   </ng-container>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.ts
index 51fbf55d5e..59e69c15a8 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/org-switcher.component.ts
@@ -13,10 +13,7 @@ export class OrgSwitcherComponent {
   protected organizations$: Observable<Organization[]> =
     this.organizationService.organizations$.pipe(
       map((orgs) =>
-        orgs
-          .filter((org) => this.filter(org))
-          .sort((a, b) => a.name.localeCompare(b.name))
-          .sort((a, b) => (a.enabled ? -1 : 1)),
+        orgs.filter((org) => this.filter(org)).sort((a, b) => a.name.localeCompare(b.name)),
       ),
     );