diff --git a/src/Option.js b/src/Option.js
index 3ab7b481c2..7dafa3e5ac 100644
--- a/src/Option.js
+++ b/src/Option.js
@@ -79,7 +79,7 @@ const Option = React.createClass({
 			<div className={className}
 				style={option.style}
 				role="option"
-				 onMouseDown={this.handleMouseDown}
+				onMouseDown={this.handleMouseDown}
 				onMouseEnter={this.handleMouseEnter}
 				onMouseMove={this.handleMouseMove}
 				onTouchStart={this.handleTouchStart}
diff --git a/src/utils/defaultMenuRenderer.js b/src/utils/defaultMenuRenderer.js
index b5ba47b0bf..4927bc51b2 100644
--- a/src/utils/defaultMenuRenderer.js
+++ b/src/utils/defaultMenuRenderer.js
@@ -25,6 +25,7 @@ function menuRenderer ({
 			'is-selected': isSelected,
 			'is-focused': isFocused,
 			'is-disabled': option.disabled,
+			[option.className]: !!option.className
 		});
 
 		return (