diff --git a/src/Select.js b/src/Select.js
index ed3f83c0bb..faabf7ccf2 100644
--- a/src/Select.js
+++ b/src/Select.js
@@ -381,15 +381,18 @@ class Select extends React.Component {
 				if (event.shiftKey || !this.state.isOpen || !this.props.tabSelectsValue) {
 					return;
 				}
+				event.preventDefault();
 				this.selectFocusedOption();
 			return;
 			case 13: // enter
-				if (!this.state.isOpen) {
+				event.preventDefault();
+				event.stopPropagation();
+				if (this.state.isOpen) {
+					this.selectFocusedOption();
+				} else {
 					this.focusNextOption();
-					return;
 				}
-				event.stopPropagation();
-				this.selectFocusedOption();
+				return;
 			break;
 			case 27: // escape
 				if (this.state.isOpen) {