diff --git a/app/soapbox/features/chats/components/chat_window.js b/app/soapbox/features/chats/components/chat_window.js
index af9f9bcee..e1c67a2b2 100644
--- a/app/soapbox/features/chats/components/chat_window.js
+++ b/app/soapbox/features/chats/components/chat_window.js
@@ -63,6 +63,7 @@ class ChatWindow extends ImmutablePureComponent {
       if (e.key === 'Enter') {
         this.props.dispatch(sendChatMessage(chatId, this.state));
         this.setState({ content: '' });
+        e.preventDefault();
       }
     };
   }
@@ -134,9 +135,9 @@ class ChatWindow extends ImmutablePureComponent {
         </div>
         <div className='pane__content'>
           <ChatMessageList chatMessageIds={chatMessageIds} />
-          <div className='pane__actions'>
-            <input
-              type='text'
+          <div className='pane__actions simple_form'>
+            <textarea
+              rows={1}
               placeholder='Send a message...'
               onKeyDown={this.handleKeyDown(chat.get('id'))}
               onChange={this.handleContentChange}
diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index cb498e628..f12dc6f1e 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -93,7 +93,7 @@
     margin-top: auto;
     padding: 6px;
 
-    input {
+    textarea {
       width: 100%;
       margin: 0;
       box-sizing: border-box;