diff --git a/packages/grafana-ui/src/components/Combobox/Combobox.story.tsx b/packages/grafana-ui/src/components/Combobox/Combobox.story.tsx
index 7bb767e9dbd..2b0e4dcf178 100644
--- a/packages/grafana-ui/src/components/Combobox/Combobox.story.tsx
+++ b/packages/grafana-ui/src/components/Combobox/Combobox.story.tsx
@@ -26,7 +26,7 @@ const meta: Meta<PropsAndCustomArgs> = {
   args: {
     loading: undefined,
     invalid: undefined,
-    width: undefined,
+    width: 20,
     isClearable: false,
     placeholder: 'Select an option...',
     options: [
diff --git a/packages/grafana-ui/src/components/Combobox/Combobox.tsx b/packages/grafana-ui/src/components/Combobox/Combobox.tsx
index b33d9d94991..de23afd82e4 100644
--- a/packages/grafana-ui/src/components/Combobox/Combobox.tsx
+++ b/packages/grafana-ui/src/components/Combobox/Combobox.tsx
@@ -354,7 +354,7 @@ export const Combobox = <T extends string | number>(props: ComboboxProps<T>) =>
     },
   });
 
-  const { inputRef, floatingRef, floatStyles, scrollRef } = useComboboxFloat(items, rowVirtualizer.range, isOpen);
+  const { inputRef, floatingRef, floatStyles, scrollRef } = useComboboxFloat(items, isOpen);
 
   const isAutoSize = width === 'auto';
 
diff --git a/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx b/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx
index 7ca4a521a44..d21c0599055 100644
--- a/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx
+++ b/packages/grafana-ui/src/components/Combobox/MultiCombobox.tsx
@@ -6,13 +6,16 @@ import { useStyles2 } from '../../themes';
 import { Checkbox } from '../Forms/Checkbox';
 import { Box } from '../Layout/Box/Box';
 import { Portal } from '../Portal/Portal';
+import { ScrollContainer } from '../ScrollContainer/ScrollContainer';
 import { Text } from '../Text/Text';
 import { Tooltip } from '../Tooltip';
 
 import { ComboboxOption, ComboboxBaseProps, AutoSizeConditionals, itemToString } from './Combobox';
 import { OptionListItem } from './OptionListItem';
 import { ValuePill } from './ValuePill';
+import { getComboboxStyles } from './getComboboxStyles';
 import { getMultiComboboxStyles } from './getMultiComboboxStyles';
+import { useComboboxFloat } from './useComboboxFloat';
 import { useMeasureMulti } from './useMeasureMulti';
 
 interface MultiComboboxBaseProps<T extends string | number> extends Omit<ComboboxBaseProps<T>, 'value' | 'onChange'> {
@@ -35,9 +38,13 @@ export const MultiCombobox = <T extends string | number>(props: MultiComboboxPro
     return getSelectedItemsFromValue<T>(value, options);
   }, [value, options, isAsync]);
 
+  const styles = useStyles2(getComboboxStyles);
+
   const [items, _baseSetItems] = useState(isAsync ? [] : options);
   const [isOpen, setIsOpen] = useState(false);
 
+  const { inputRef: containerRef, floatingRef, floatStyles, scrollRef } = useComboboxFloat(items, isOpen);
+
   const multiStyles = useStyles2(getMultiComboboxStyles, isOpen);
 
   const { measureRef, suffixMeasureRef, shownItems } = useMeasureMulti(selectedItems, width);
@@ -124,7 +131,7 @@ export const MultiCombobox = <T extends string | number>(props: MultiComboboxPro
   const visibleItems = isOpen ? selectedItems : selectedItems.slice(0, shownItems);
 
   return (
-    <div>
+    <div ref={containerRef}>
       <div
         style={{ width: width === 'auto' ? undefined : width }}
         className={multiStyles.wrapper}
@@ -175,31 +182,37 @@ export const MultiCombobox = <T extends string | number>(props: MultiComboboxPro
           />
         </span>
       </div>
-      <div {...getMenuProps()}>
-        <Portal>
+      <Portal>
+        <div
+          className={cx(styles.menu, !isOpen && styles.menuClosed)}
+          style={{ ...floatStyles }}
+          {...getMenuProps({ ref: floatingRef })}
+        >
           {isOpen && (
-            <div>
-              {items.map((item, index) => {
-                const itemProps = getItemProps({ item, index });
-                const isSelected = isOptionSelected(item);
-                const id = 'multicombobox-option-' + item.value.toString();
-                return (
-                  <li
-                    key={item.value}
-                    {...itemProps}
-                    style={highlightedIndex === index ? { backgroundColor: 'blue' } : {}}
-                  >
-                    {' '}
-                    {/* Add styling with virtualization */}
-                    <Checkbox key={id} value={isSelected} aria-labelledby={id} />
-                    <OptionListItem option={item} id={id} />
-                  </li>
-                );
-              })}
-            </div>
+            <ScrollContainer showScrollIndicators maxHeight="inherit" ref={scrollRef}>
+              <ul>
+                {items.map((item, index) => {
+                  const itemProps = getItemProps({ item, index });
+                  const isSelected = isOptionSelected(item);
+                  const id = 'multicombobox-option-' + item.value.toString();
+                  return (
+                    <li
+                      key={item.value}
+                      {...itemProps}
+                      style={highlightedIndex === index ? { backgroundColor: 'blue' } : {}}
+                    >
+                      {' '}
+                      {/* Add styling with virtualization */}
+                      <Checkbox key={id} value={isSelected} aria-labelledby={id} />
+                      <OptionListItem option={item} id={id} />
+                    </li>
+                  );
+                })}
+              </ul>
+            </ScrollContainer>
           )}
-        </Portal>
-      </div>
+        </div>
+      </Portal>
     </div>
   );
 };
diff --git a/packages/grafana-ui/src/components/Combobox/useComboboxFloat.ts b/packages/grafana-ui/src/components/Combobox/useComboboxFloat.ts
index 3a72680203f..23433b6560a 100644
--- a/packages/grafana-ui/src/components/Combobox/useComboboxFloat.ts
+++ b/packages/grafana-ui/src/components/Combobox/useComboboxFloat.ts
@@ -18,11 +18,7 @@ const WIDTH_CALCULATION_LIMIT_ITEMS = 100_000;
 // Clearance around the popover to prevent it from being too close to the edge of the viewport
 const POPOVER_PADDING = 16;
 
-export const useComboboxFloat = (
-  items: Array<ComboboxOption<string | number>>,
-  range: { startIndex: number; endIndex: number } | null,
-  isOpen: boolean
-) => {
+export const useComboboxFloat = (items: Array<ComboboxOption<string | number>>, isOpen: boolean) => {
   const inputRef = useRef<HTMLInputElement>(null);
   const floatingRef = useRef<HTMLDivElement>(null);
   const scrollRef = useRef<HTMLDivElement>(null);