diff --git a/src/components/ComposeTextPanel/index.js b/src/components/ComposeTextPanel/index.js
index 40760d3a34..b3277651df 100644
--- a/src/components/ComposeTextPanel/index.js
+++ b/src/components/ComposeTextPanel/index.js
@@ -74,6 +74,7 @@ class ComposeTextPanel extends Component {
     };
 
     this.onTextAreaKeyDown = (e) => {
+      console.debug('onTextAreaKeyDown', e);
       if (e.key === 'Enter') {
         e.preventDefault();
         this.props.send();
@@ -153,7 +154,7 @@ class ComposeTextPanel extends Component {
                 value={this.props.messageText}
                 maxLength="1000"
                 onChange={this.onTextChange}
-                onKeyDown={this.onTextAreaKeyDown}
+                onKeyPressCapture={this.onTextAreaKeyDown}
               />
             </div>
             <div className={styles.submitField}>
diff --git a/src/components/ConversationPanel/index.js b/src/components/ConversationPanel/index.js
index 8dbf04d2d0..9b08ca09f6 100644
--- a/src/components/ConversationPanel/index.js
+++ b/src/components/ConversationPanel/index.js
@@ -214,7 +214,7 @@ class ConversationPanel extends Component {
                 value={this.state.textValue}
                 maxLength="1000"
                 onChange={this.onTextChange}
-                onKeyDown={this.onTextAreaKeyDown}
+                onKeyPressCapture={this.onTextAreaKeyDown}
               />
             </div>
             <div className={styles.submitField}>