diff --git a/packages/grafana-ui/src/components/OptionsUI/multiSelect.tsx b/packages/grafana-ui/src/components/OptionsUI/multiSelect.tsx
index 627539fd2dc..c6d45a53d87 100644
--- a/packages/grafana-ui/src/components/OptionsUI/multiSelect.tsx
+++ b/packages/grafana-ui/src/components/OptionsUI/multiSelect.tsx
@@ -59,6 +59,7 @@ export class MultiSelectValueEditor<T> extends React.PureComponent<Props<T>, Sta
     const { settings } = item;
     return (
       <MultiSelect<T>
+        menuShouldPortal
         isLoading={isLoading}
         value={value}
         defaultValue={value}
diff --git a/packages/grafana-ui/src/components/OptionsUI/select.tsx b/packages/grafana-ui/src/components/OptionsUI/select.tsx
index 3023c30f480..ac45c393c91 100644
--- a/packages/grafana-ui/src/components/OptionsUI/select.tsx
+++ b/packages/grafana-ui/src/components/OptionsUI/select.tsx
@@ -62,6 +62,7 @@ export class SelectValueEditor<T> extends React.PureComponent<Props<T>, State<T>
     }
     return (
       <Select<T>
+        menuShouldPortal
         isLoading={isLoading}
         value={current}
         defaultValue={value}