diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
index 805aad3d52d..e6e68351e2b 100644
--- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@ -62,6 +62,7 @@ const ComposeForm = React.createClass({
   },
 
   handleSubmit () {
+    this.autosuggestTextarea.textarea.style.height = "auto";
     this.props.onSubmit();
   },