diff --git a/src/enhanced-textarea.jsx b/src/enhanced-textarea.jsx
index a0d7ba713d2817..90e60a430fec9f 100644
--- a/src/enhanced-textarea.jsx
+++ b/src/enhanced-textarea.jsx
@@ -138,6 +138,8 @@ const EnhancedTextarea = React.createClass({
       newHeight = Math.min(this.props.rowsMax * rowsHeight, newHeight);
     }
 
+    newHeight = Math.max(newHeight, rowsHeight);
+
     if (this.state.height !== newHeight) {
       this.setState({
         height: newHeight,