diff --git a/packages/grafana-ui/src/components/Combobox/useComboboxFloat.ts b/packages/grafana-ui/src/components/Combobox/useComboboxFloat.ts
index bedebb4b749..e2f7e3ac851 100644
--- a/packages/grafana-ui/src/components/Combobox/useComboboxFloat.ts
+++ b/packages/grafana-ui/src/components/Combobox/useComboboxFloat.ts
@@ -41,7 +41,7 @@ export const useComboboxFloat = (
         const preferredMaxHeight = availableHeight - POPOVER_PADDING;
 
         const width = Math.max(preferredMaxWidth, 0);
-        const height = Math.min(Math.max(preferredMaxHeight, OPTION_HEIGHT), POPOVER_MAX_HEIGHT);
+        const height = Math.min(Math.max(preferredMaxHeight, OPTION_HEIGHT * 6), POPOVER_MAX_HEIGHT);
 
         setPopoverMaxSize({ width, height });
       },