diff --git a/client/lib/textarea-autogrow.js b/client/lib/textarea-autogrow.js
index f566e9d8399..24098c975f3 100644
--- a/client/lib/textarea-autogrow.js
+++ b/client/lib/textarea-autogrow.js
@@ -72,6 +72,7 @@
 			$(window).resize(update);
 
 			update();
+			self.updateAutogrow = update;
 		});
 	};
 })(jQuery);
diff --git a/client/views/app/room.coffee b/client/views/app/room.coffee
index 476b71373d8..01e0b16809c 100644
--- a/client/views/app/room.coffee
+++ b/client/views/app/room.coffee
@@ -371,6 +371,7 @@ Template.room.events
 		event.preventDefault()
 		event.stopPropagation()
 		input.focus()
+		input.get(0).updateAutogrow()
 
 	'click .add-user': (event) ->
 		toggleAddUser()
diff --git a/client/views/app/room.html b/client/views/app/room.html
index aa5002e25d9..3c5025e597b 100644
--- a/client/views/app/room.html
+++ b/client/views/app/room.html
@@ -52,7 +52,7 @@
 							</div>
 							<div class="input-message-container">
 								{{> messagePopupConfig getPupupConfig}}
-								<textarea dir="auto" name="msg" maxlength="{{maxMessageLength}}" class="input-message" placeholder="{{_ 'Message'}}"></textarea>
+								<textarea dir="auto" name="msg" maxlength="{{maxMessageLength}}" class="input-message autogrow-short" placeholder="{{_ 'Message'}}"></textarea>
 								<i class="icon-paper-plane" title="{{_ "Send_Message"}}"></i>
 							</div>
 							{{#if canRecordAudio}}