diff --git a/apps/dashboard/src/components/ui/combobox-advanced.tsx b/apps/dashboard/src/components/ui/combobox-advanced.tsx
index 0c791421..8c856424 100644
--- a/apps/dashboard/src/components/ui/combobox-advanced.tsx
+++ b/apps/dashboard/src/components/ui/combobox-advanced.tsx
@@ -121,7 +121,12 @@ export function ComboboxAdvanced({
             value={inputValue}
             onValueChange={setInputValue}
           />
-          <VirtualList height={300} data={data} itemHeight={32} itemKey="value">
+          <VirtualList
+            height={Math.min(items.length * 32, 300)}
+            data={data}
+            itemHeight={32}
+            itemKey="value"
+          >
             {renderItem}
           </VirtualList>
         </Command>
diff --git a/apps/dashboard/src/components/ui/combobox.tsx b/apps/dashboard/src/components/ui/combobox.tsx
index 8a6a8e48..5edeca77 100644
--- a/apps/dashboard/src/components/ui/combobox.tsx
+++ b/apps/dashboard/src/components/ui/combobox.tsx
@@ -124,7 +124,7 @@ export function Combobox<T extends string>({
             <CommandEmpty>Nothing selected</CommandEmpty>
           )}
           <VirtualList
-            height={300}
+            height={Math.min(items.length * 32, 300)}
             data={items.filter((item) => {
               if (search === '') return true;
               return item.label.toLowerCase().includes(search.toLowerCase());