diff --git a/src/components/views/messages/MessageComposer.js b/src/components/views/messages/MessageComposer.js
index eefec48cff..932fa8c5a7 100644
--- a/src/components/views/messages/MessageComposer.js
+++ b/src/components/views/messages/MessageComposer.js
@@ -168,6 +168,7 @@ module.exports = React.createClass({
             this.refs.textarea,
             this.props.room.roomId
         );
+        this.resizeInput();
     },
 
     componentWillUnmount: function() {