diff --git a/src/Select.js b/src/Select.js
index <HASH>..<HASH> 100644
--- a/src/Select.js
+++ b/src/Select.js
@@ -553,6 +553,7 @@ var Select = React.createClass({
 			var filterOption = function(op) {
 				if (this.props.multi && exclude.indexOf(op.value) > -1) return false;
 				if (this.props.filterOption) return this.props.filterOption.call(this, op, filterValue);
+				if (filterValue && op.disabled) return false;
 				var valueTest = String(op.value), labelTest = String(op.label);
 				if (this.props.ignoreCase) {
 					valueTest = valueTest.toLowerCase();
@@ -595,7 +596,9 @@ var Select = React.createClass({
 	focusAdjacentOption: function(dir) {
 		this._focusedOptionReveal = true;
 
-		var ops = this.state.filteredOptions;
+		var ops = this.state.filteredOptions.filter(function(op) {
+			return !op.disabled;
+		});
 
 		if (!this.state.isOpen) {
 			this.setState({
Disabled options should not be selectable

Conflicts:
	src/Select.js