diff --git a/src/static/css/pad/chat.css b/src/static/css/pad/chat.css
index 98f96109b..ac7334bea 100644
--- a/src/static/css/pad/chat.css
+++ b/src/static/css/pad/chat.css
@@ -109,6 +109,7 @@
 }
 #chatinputbox #chatinput {
   width: 100%;
+  resize: vertical;
 }
 
 
diff --git a/src/templates/pad.html b/src/templates/pad.html
index d7c3c0823..110e76158 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -388,7 +388,7 @@
             </div>
             <div id="chatinputbox">
                 <form>
-                    <input id="chatinput" type="text" maxlength="999" data-l10n-id="pad.chat.writeMessage.placeholder">
+                    <textarea id="chatinput" maxlength="999" data-l10n-id="pad.chat.writeMessage.placeholder"></textarea>
                 </form>
             </div>
           </div>
diff --git a/src/tests/frontend/specs/chat.js b/src/tests/frontend/specs/chat.js
index 3b1eaebf3..82527f372 100644
--- a/src/tests/frontend/specs/chat.js
+++ b/src/tests/frontend/specs/chat.js
@@ -25,7 +25,9 @@ describe('Chat messages and UI', function () {
     const username = helper.chatTextParagraphs().children('b').text();
     const time = helper.chatTextParagraphs().children('.time').text();
 
-    expect(helper.chatTextParagraphs().text()).to.be(`${username}${time} ${chatValue}`);
+    // TODO: The '\n' is an artifact of $.sendkeys('{enter}'). Figure out how to get rid of it
+    // without breaking the other tests that use $.sendkeys().
+    expect(helper.chatTextParagraphs().text()).to.be(`${username}${time} ${chatValue}\n`);
 
     await helper.hideChat();
   });
@@ -46,7 +48,9 @@ describe('Chat messages and UI', function () {
     const username = chat.children('b').text();
     const time = chat.children('.time').text();
 
-    expect(chat.text()).to.be(`${username}${time} ${chatValue}`);
+    // TODO: Each '\n' is an artifact of $.sendkeys('{enter}'). Figure out how to get rid of them
+    // without breaking the other tests that use $.sendkeys().
+    expect(chat.text()).to.be(`${username}${time} \n${chatValue}\n`);
   });
 
   it('makes chat stick to right side of the screen via settings, ' +