diff --git a/BTCPayServer/Components/StoreSelector/StoreSelector.cs b/BTCPayServer/Components/StoreSelector/StoreSelector.cs
index 7ed170e93..2750b8c42 100644
--- a/BTCPayServer/Components/StoreSelector/StoreSelector.cs
+++ b/BTCPayServer/Components/StoreSelector/StoreSelector.cs
@@ -47,6 +47,7 @@ namespace BTCPayServer.Components.StoreSelector
                         WalletId = walletId
                     };
                 })
+                .OrderBy(s => s.Text)
                 .ToList();
 
             var vm = new StoreSelectorViewModel
diff --git a/BTCPayServer/wwwroot/main/layout.css b/BTCPayServer/wwwroot/main/layout.css
index 3a742e4ac..35ef8aa69 100644
--- a/BTCPayServer/wwwroot/main/layout.css
+++ b/BTCPayServer/wwwroot/main/layout.css
@@ -174,6 +174,8 @@
 
 #StoreSelectorMenu {
     min-width: 100%;
+    max-height: calc(100vh - var(--header-height));
+    overflow-y: scroll;
 }
 
 /* Logo */