diff --git a/BTCPayServer/Controllers/UIManageController.APIKeys.cs b/BTCPayServer/Controllers/UIManageController.APIKeys.cs
index a6eaafd20..d369bc177 100644
--- a/BTCPayServer/Controllers/UIManageController.APIKeys.cs
+++ b/BTCPayServer/Controllers/UIManageController.APIKeys.cs
@@ -466,7 +466,9 @@ namespace BTCPayServer.Controllers
 
         private async Task<T> SetViewModelValues<T>(T viewModel) where T : AddApiKeyViewModel
         {
-            viewModel.Stores = await _StoreRepository.GetStoresByUserId(_userManager.GetUserId(User));
+            var stores = await _StoreRepository.GetStoresByUserId(_userManager.GetUserId(User));
+            viewModel.Stores = stores.OrderBy(store => store.StoreName, StringComparer.InvariantCultureIgnoreCase).ToArray();
+
             var isAdmin = (await _authorizationService.AuthorizeAsync(User, Policies.CanModifyServerSettings))
                 .Succeeded;
             viewModel.PermissionValues ??= Policies.AllPolicies
diff --git a/BTCPayServer/Controllers/UIUserStoresController.cs b/BTCPayServer/Controllers/UIUserStoresController.cs
index 37ea5538a..5a796dac7 100644
--- a/BTCPayServer/Controllers/UIUserStoresController.cs
+++ b/BTCPayServer/Controllers/UIUserStoresController.cs
@@ -52,6 +52,7 @@ namespace BTCPayServer.Controllers
             {
                 Stores = stores
                     .Where(s => s.Archived == archived)
+                    .OrderBy(s => s.StoreName, StringComparer.InvariantCultureIgnoreCase)
                     .Select(s => new ListStoresViewModel.StoreViewModel
                     {
                         StoreId = s.Id,