From 4c70c14051abea5937756d4f9e40596a95e18d18 Mon Sep 17 00:00:00 2001
From: Andrew Aquino <dawneraq@gmail.com>
Date: Sat, 12 Sep 2026 02:22:45 +0000
Subject: [PATCH] fix: minimize scrolling when command list scrolls into view

---
 .../components/MultiSelectCombobox/MultiSelectCombobox.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/site/src/components/MultiSelectCombobox/MultiSelectCombobox.tsx b/site/src/components/MultiSelectCombobox/MultiSelectCombobox.tsx
index 87febd8db3f75..3bfc8667df074 100644
--- a/site/src/components/MultiSelectCombobox/MultiSelectCombobox.tsx
+++ b/site/src/components/MultiSelectCombobox/MultiSelectCombobox.tsx
@@ -355,7 +355,7 @@ export const MultiSelectCombobox: React.FC<MultiSelectComboboxProps> = ({
 			return;
 		}
 
-		listRef.current.scrollIntoView({ behavior: "smooth" });
+		listRef.current.scrollIntoView({ block: "nearest", behavior: "smooth" });
 	}, [open]);
 
 	const CreatableItem = () => {
@@ -598,13 +598,14 @@ export const MultiSelectCombobox: React.FC<MultiSelectComboboxProps> = ({
 					</div>
 				</div>
 			</div>
-			<div className="relative" ref={listRef}>
+			<div className="relative">
 				{open && (
 					<CommandList
+						ref={listRef}
 						className={`absolute top-1 z-10 w-full rounded-md
 								border border-solid border-border
 								bg-surface-primary text-content-primary shadow-md outline-hidden
-								animate-in`}
+								animate-in scroll-mt-44 scroll-mb-10`}
 						onPointerLeave={() => {
 							setOnScrollbar(false);
 						}}