Merge pull request #1448 from thezanke/master

Fixes #1447 - Uncaught TypeError
JedWatson · Jan 31, 2017 · 7d4b8f0 · 7d4b8f0
2 parents 06766b4 + f11520a
commit 7d4b8f0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Select.js b/src/Select.js
@@ -712,7 +712,7 @@ const Select = React.createClass({
 			this.setState({
 				isOpen: true,
 				inputValue: '',
-				focusedOption: this._focusedOption || options[dir === 'next' ? 0 : options.length - 1].option
+				focusedOption: this._focusedOption || (options.length ? options[dir === 'next' ? 0 : options.length - 1].option : null)
 			});
 			return;
 		}