diff --git a/src/Select.js b/src/Select.js
index 71fffa37ae..20bdc4ac6e 100644
--- a/src/Select.js
+++ b/src/Select.js
@@ -216,6 +216,15 @@ class Select extends React.Component {
 		}
 
 		if (event.target.tagName === 'INPUT') {
+			if (!this.state.isFocused) {
+				this._openAfterFocus = this.props.openOnClick;
+				this.focus();
+			} else if (!this.state.isOpen) {
+				this.setState({
+					isOpen: true,
+					isPseudoFocused: false,
+				});
+			}
 			return;
 		}