diff --git a/desktop/frontend/src/__tests__/typography-overflow-contract.test.ts b/desktop/frontend/src/__tests__/typography-overflow-contract.test.ts
index a0d05201e6..639c85acfc 100644
--- a/desktop/frontend/src/__tests__/typography-overflow-contract.test.ts
+++ b/desktop/frontend/src/__tests__/typography-overflow-contract.test.ts
@@ -117,6 +117,9 @@ eq(finalDeclaration(".provider-template-grid", "grid-auto-rows"), "92px", "provi
 eq(finalDeclaration(".provider-template-card", "height"), "100%", "provider preset cards stretch to the grid row height");
 eq(finalDeclaration(".provider-template-card strong", "-webkit-line-clamp"), "1", "provider preset card titles clamp to one line");
 eq(finalDeclaration(".provider-template-card span", "-webkit-line-clamp"), "2", "provider preset card descriptions clamp to two lines");
+eq(finalDeclaration(".provider-model-draft__list", "grid-auto-rows"), "min-content", "provider model rows grow with their content");
+eq(finalDeclaration(".provider-model-draft__option", "min-height"), undefined, "provider model cards do not force undersized rows");
+eq(finalDeclaration(".provider-model-draft__option", "overflow"), "hidden", "provider model cards contain overflowing controls");
 
 eq(finalDeclaration(".statusbar", "white-space"), "nowrap", "status bar keeps metrics on one row");
 eq(finalDeclaration(".statusbar", "overflow"), "hidden", "status bar clips instead of overflowing");
diff --git a/desktop/frontend/src/styles.css b/desktop/frontend/src/styles.css
index 321e9a5952..1335429384 100644
--- a/desktop/frontend/src/styles.css
+++ b/desktop/frontend/src/styles.css
@@ -15198,14 +15198,14 @@ body > .mermaid-diagram--fullscreen {
   gap: 6px;
   max-height: 220px;
   overflow: auto;
-  padding-right: 2px;
+  padding: 0 2px 6px 0;
+  grid-auto-rows: min-content;
 }
 .provider-model-draft__option {
   min-width: 0;
   display: flex;
   flex-direction: column;
   gap: 4px;
-  min-height: 32px;
   padding: 5px 7px;
   border: 1px solid var(--border-soft);
   border-radius: 7px;
@@ -15213,6 +15213,7 @@ body > .mermaid-diagram--fullscreen {
   color: var(--fg);
   font-family: var(--mono);
   font-size: var(--text-2xs);
+  overflow: hidden;
 }
 .provider-model-draft__model,
 .provider-model-draft__vision {