diff --git a/libs/ui/src/lib/account-selector/account-selector.component.html b/libs/ui/src/lib/account-selector/account-selector.component.html
index 3fd21e58a..0ba679706 100644
--- a/libs/ui/src/lib/account-selector/account-selector.component.html
+++ b/libs/ui/src/lib/account-selector/account-selector.component.html
@@ -28,7 +28,7 @@
       <mat-option [value]="null" />
     }
 
-    @for (account of accounts(); track account.id) {
+    @for (account of sortedAccounts(); track account.id) {
       <mat-option [value]="account.id">
         <div class="d-flex">
           <gf-entity-logo
diff --git a/libs/ui/src/lib/account-selector/account-selector.component.ts b/libs/ui/src/lib/account-selector/account-selector.component.ts
index 819abbf92..bb4ef646e 100644
--- a/libs/ui/src/lib/account-selector/account-selector.component.ts
+++ b/libs/ui/src/lib/account-selector/account-selector.component.ts
@@ -61,6 +61,12 @@ export class GfAccountSelectorComponent
     });
   });
 
+  public readonly sortedAccounts = computed(() => {
+    return [...this.accounts()].sort((a, b) => {
+      return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
+    });
+  });
+
   private readonly ngControl = inject(NgControl, {
     optional: true,
     self: true