diff --git a/public/app/core/components/Picker/Unit/UnitPicker.tsx b/public/app/core/components/Picker/Unit/UnitPicker.tsx
index bbbac7f76f4..6cb4a4cbdb4 100644
--- a/public/app/core/components/Picker/Unit/UnitPicker.tsx
+++ b/public/app/core/components/Picker/Unit/UnitPicker.tsx
@@ -34,7 +34,7 @@ export default class UnitPicker extends PureComponent<Props> {
     const styles = {
       ...ResetStyles,
       menu: () => ({
-        maxHeight: '500px',
+        maxHeight: '75%',
         overflow: 'scroll',
       }),
       menuList: () =>
@@ -54,6 +54,7 @@ export default class UnitPicker extends PureComponent<Props> {
         className="width-20 gf-form-input--form-dropdown"
         defaultValue={value}
         isSearchable={true}
+        menuShouldScrollIntoView={false}
         options={groupOptions}
         placeholder="Choose"
         onChange={onSelected}