diff --git a/src/components/views/messages/MessageComposer.js b/src/components/views/messages/MessageComposer.js
index 869e9f7614..cad584b981 100644
--- a/src/components/views/messages/MessageComposer.js
+++ b/src/components/views/messages/MessageComposer.js
@@ -69,6 +69,7 @@ module.exports = React.createClass({
             original: null,
             index: 0
         };
+        var self = this;
         this.sentHistory = {
             // The list of typed messages. Index 0 is more recent
             data: [],
@@ -138,6 +139,8 @@ module.exports = React.createClass({
                     // restore the original text the user was typing.
                     this.element.value = this.originalText;
                 }
+
+                self.resizeInput();
                 return true;
             },
 
@@ -153,6 +156,7 @@ module.exports = React.createClass({
                 var text = window.sessionStorage.getItem("input_" + this.roomId);
                 if (text) {
                     this.element.value = text;
+                    self.resizeInput();
                 }
             }
         };