diff --git a/config.json b/config.json
index de6015a1..5d86ba55 100644
--- a/config.json
+++ b/config.json
@@ -6,7 +6,52 @@
     "matrix.org",
     "monero.social",
     "mozilla.org",
-    "xmr.se"
+    "xmr.se",
+    "4d2.org",
+    "archaeo.social",
+    "bark.lgbt",
+    "calitabby.net",
+    "catgirl.cloud",
+    "comm.cx",
+    "digitalprivacy.diy",
+    "exarius.org",
+    "furryrefuge.com",
+    "g24.at",
+    "gemeinsam.jetzt",
+    "glasgow.social",
+    "gnulinux.club",
+    "grin.hu",
+    "hot-chilli.im",
+    "imagisphe.re",
+    "jonasled.de",
+    "magdeburg.jetzt",
+    "nope.chat",
+    "oblak.be",
+    "pcriot.org",
+    "pub.solar",
+    "rollenspiel.chat",
+    "socialnetwork24.com",
+    "synod.im",
+    "tchncs.de",
+    "tedomum.net",
+    "unredacted.org",
+    "we2.ee",
+    "fachschaften.org",
+    "pikaviestin.fi",
+    "federated.nexus",
+    "frei.chat",
+    "hyteck.de",
+    "norge.chat",
+    "private.coffee",
+    "the-apothecary.club",
+    "communick.com",
+    "data.coop",
+    "fsfe.org",
+    "hadoly.fr",
+    "sans-nuage.fr",
+    "libreon.fr",
+    "transgirl.cafe",
+    "deuxfleurs.fr"
   ],
   "allowCustomHomeservers": true,
 
diff --git a/src/app/pages/auth/ServerPicker.tsx b/src/app/pages/auth/ServerPicker.tsx
index a2a78106..ac7fad89 100644
--- a/src/app/pages/auth/ServerPicker.tsx
+++ b/src/app/pages/auth/ServerPicker.tsx
@@ -111,7 +111,14 @@ export function ServerPicker({
                   <Header size="300" style={{ padding: `0 ${config.space.S200}` }}>
                     <Text size="L400">Homeserver List</Text>
                   </Header>
-                  <div style={{ padding: config.space.S100, paddingTop: 0 }}>
+                  <div style={{
+                    padding: config.space.S100,
+                    paddingTop: 0,
+                    maxHeight: 320,
+                    overflowY: 'auto',
+                    WebkitOverflowScrolling: 'touch',
+                    }}
+                  >
                     {serverList?.map((serverName) => (
                       <MenuItem
                         key={serverName}