diff --git a/src/select/select.tsx b/src/select/select.tsx
index d889712c08..d50c0f357f 100644
--- a/src/select/select.tsx
+++ b/src/select/select.tsx
@@ -567,7 +567,7 @@ export class Select extends React.Component<SelectProps, SelectState> {
                 for={ this.props.name }
                 className={ this.cn('popup') }
                 directions={ this.props.directions }
-                height="adaptive"
+                height={ this.props.maxHeight ? 'default' : 'adaptive' }
                 padded={ false }
                 mainOffset={ this.props.popupMainOffset }
                 secondaryOffset={ this.props.popupSecondaryOffset }