diff --git a/public/index.html b/public/index.html
index 1f90077..1d6f077 100644
--- a/public/index.html
+++ b/public/index.html
@@ -163,7 +163,7 @@
             <x-background class="full center">
                 <x-paper shadow="2">
                     <h3>Send a Message</h3>
-                    <input id="textInput" class="textarea w100" role="textbox" placeholder="Send a message" autocomplete="off" autofocus contenteditable>
+                    <div id="textInput" class="textarea" role="textbox" placeholder="Send a message" autocomplete="off" autofocus contenteditable></div>
                     <div class="row-reverse">
                         <button class="button" type="submit" close>Send</button>
                         <a class="button" close>Cancel</a>
diff --git a/public/scripts/ui.js b/public/scripts/ui.js
index 2783e8a..43a1542 100644
--- a/public/scripts/ui.js
+++ b/public/scripts/ui.js
@@ -915,8 +915,9 @@ class SendTextDialog extends Dialog {
             if (e.code === "Escape") {
                 this.hide();
             }
-            if (e.code === "Enter" && (!e.ctrlKey && !e.metaKey)) {
-                e.preventDefault();
+            if (e.code === "Enter" && (e.ctrlKey || e.metaKey)) {
+                this._send();
+                this.hide();
             }
         }
     }
@@ -930,7 +931,9 @@ class SendTextDialog extends Dialog {
         const sel = window.getSelection();
 
         this.$text.focus();
-        this.$text.select();
+        range.selectNodeContents(this.$text);
+        sel.removeAllRanges();
+        sel.addRange(range);
     }
 
     _handleShareTargetText() {
@@ -942,7 +945,7 @@ class SendTextDialog extends Dialog {
     _send() {
         Events.fire('send-text', {
             to: this._recipient,
-            text: this.$text.value
+            text: this.$text.innerText
         });
         this.$text.value = "";
     }
diff --git a/public/styles.css b/public/styles.css
index 4160435..adf7768 100644
--- a/public/styles.css
+++ b/public/styles.css
@@ -469,6 +469,12 @@ x-dialog .font-subheading {
     padding-bottom: 5px;
 }
 
+/* Send Text Dialog */
+
+#textInput {
+    min-height: 120px;
+}
+
 /* Receive Text Dialog */
 
 #receiveTextDialog #text {