diff --git a/packages/grafana-ui/src/components/Forms/Select/SelectBase.tsx b/packages/grafana-ui/src/components/Forms/Select/SelectBase.tsx
index bd820370c5a..fbb2f820719 100644
--- a/packages/grafana-ui/src/components/Forms/Select/SelectBase.tsx
+++ b/packages/grafana-ui/src/components/Forms/Select/SelectBase.tsx
@@ -229,6 +229,7 @@ export function SelectBase<T>({
     onKeyDown,
     menuShouldScrollIntoView: false,
     renderControl,
+    captureMenuScroll: false,
   };
 
   // width property is deprecated in favor of size or className
@@ -254,7 +255,6 @@ export function SelectBase<T>({
 
   return (
     <ReactSelectComponent
-      captureMenuScroll={false}
       components={{
         MenuList: SelectMenu,
         Group: SelectOptionGroup,
diff --git a/packages/grafana-ui/src/components/Select/Select.tsx b/packages/grafana-ui/src/components/Select/Select.tsx
index 3b4a1d8c861..8edd3dd2b5d 100644
--- a/packages/grafana-ui/src/components/Select/Select.tsx
+++ b/packages/grafana-ui/src/components/Select/Select.tsx
@@ -133,6 +133,7 @@ export class Select<T> extends PureComponent<LegacySelectProps<T>> {
         {(onOpenMenuInternal, onCloseMenuInternal) => {
           return (
             <SelectComponent
+              captureMenuScroll={false}
               classNamePrefix="gf-form-select-box"
               className={selectClassNames}
               components={selectComponents}
@@ -226,6 +227,7 @@ export class AsyncSelect<T> extends PureComponent<AsyncProps<T>> {
         {(onOpenMenuInternal, onCloseMenuInternal) => {
           return (
             <ReactAsyncSelect
+              captureMenuScroll={false}
               classNamePrefix="gf-form-select-box"
               className={selectClassNames}
               components={{