diff --git a/app/assets/javascripts/components/components/autosuggest_textarea.jsx b/app/assets/javascripts/components/components/autosuggest_textarea.jsx
index d548eeeca..9a4d5b7e3 100644
--- a/app/assets/javascripts/components/components/autosuggest_textarea.jsx
+++ b/app/assets/javascripts/components/components/autosuggest_textarea.jsx
@@ -58,7 +58,6 @@ class AutosuggestTextarea extends React.Component {
     }
 
     // auto-resize textarea
-    e.target.style.height = 'auto';
     e.target.style.height = `${e.target.scrollHeight}px`;
 
     this.props.onChange(e);
@@ -147,6 +146,10 @@ class AutosuggestTextarea extends React.Component {
     }
   }
 
+  reset () {
+    this.textarea.style.height = 'auto';
+  }
+
   render () {
     const { value, suggestions, disabled, placeholder, onKeyUp } = this.props;
     const { suggestionsHidden, selectedSuggestion } = this.state;
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 7955aaba9..6bc811160 100644
--- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@ -44,12 +44,12 @@ class ComposeForm extends React.PureComponent {
 
   handleKeyDown (e) {
     if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
-      this.props.onSubmit();
+      this.handleSubmit();
     }
   }
 
   handleSubmit () {
-    this.autosuggestTextarea.textarea.style.height = "auto";
+    this.autosuggestTextarea.reset();
     this.props.onSubmit();
   }