diff --git a/lib/Select.js b/lib/Select.js
index cd69c81c71..f3fb8bb8c8 100644
--- a/lib/Select.js
+++ b/lib/Select.js
@@ -407,7 +407,7 @@ var Select = _react2['default'].createClass({
 			});
 		} else {
 			// otherwise, focus the input and open the menu
-			this._openAfterFocus = true;
+			this._openAfterFocus = this.props.openOnFocus;
 			this.focus();
 		}
 	},
@@ -1224,4 +1224,4 @@ var Select = _react2['default'].createClass({
 });
 
 exports['default'] = Select;
-module.exports = exports['default'];
\ No newline at end of file
+module.exports = exports['default'];
diff --git a/src/Select.js b/src/Select.js
index 4dec02ba69..fc09e715f0 100644
--- a/src/Select.js
+++ b/src/Select.js
@@ -360,7 +360,7 @@ const Select = React.createClass({
 			});
 		} else {
 			// otherwise, focus the input and open the menu
-			this._openAfterFocus = true;
+			this._openAfterFocus = this.props.openOnFocus;
 			this.focus();
 		}
 	},