diff --git a/frontend/src/components/set-org/SetOrg.css b/frontend/src/components/set-org/SetOrg.css
index 125f0e8772..a1f03846d4 100644
--- a/frontend/src/components/set-org/SetOrg.css
+++ b/frontend/src/components/set-org/SetOrg.css
@@ -7,8 +7,27 @@
 }
 
 .card-list-container {
-  margin: 10%;
+  /* The scroll region. `.org-list` fills `.org-container`'s 100vh as a column
+   * flex container, so without `min-height: 0` this box refuses to shrink
+   * below its content: the extra org cards spill past the viewport and are
+   * clipped instead of scrolling. */
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+  /* Was `margin: 10%`. The horizontal half was redundant — `width: 80%` plus
+   * `align-items: center` on `.org-list` lands the cards at the same offset —
+   * so card geometry is unchanged. Note top/bottom percentages resolve
+   * against the containing block's WIDTH, as they did before. */
+  margin: 5% 0;
   width: 80%;
+  /* Room below for `.org-card-container`'s box-shadow, which the scroll box
+   * clips. No horizontal padding: it would narrow the cards and worsen the
+   * overlap between a long org name and the Connect button that
+   * `.ant-card-meta-title` below causes by setting `text-overflow: ellipsis`
+   * with no `overflow: hidden`. Fix that rule and this constraint expires.
+   * The right-hand shadow stays clipped either way; at ~5% alpha it reads as
+   * nothing. */
+  padding-bottom: 32px;
 }
 .org-list {
   background: #ffffff;
@@ -84,6 +103,9 @@
 .select-org-unstract-logo {
   width: 200px;
   margin-top: 10%;
+  /* Flex items default to `flex-shrink: 1`, so a long org list squashed the
+   * logo instead of scrolling — measured at 0px height, not merely thin. */
+  flex-shrink: 0;
 }
 
 .select-org-button {