diff --git a/site/src/components/chat/script.js b/site/src/components/chat/script.js
index f1ceb0b..52deff8 100644
--- a/site/src/components/chat/script.js
+++ b/site/src/components/chat/script.js
@@ -128,7 +128,7 @@ export default
         onMessageTextKeyDown(event)
         {
             // Enter key pressed but without shift key
-            if(event.keyCode === 13)
+            if(event.keyCode === 13 && !event.shiftKey)
             {
                 event.preventDefault()
 
diff --git a/site/src/components/chat/template.html b/site/src/components/chat/template.html
index 4ed6195..02a3c9e 100644
--- a/site/src/components/chat/template.html
+++ b/site/src/components/chat/template.html
@@ -15,9 +15,7 @@
                     <a href="#" class="file" v-if="message.file && message.line" @click.prevent="onFileClick(message.file, message.version, message.line)">
                         {{ message.file }}:{{ message.line }}
                     </a>
-                    <div class="text">
-                        {{ message.text }}
-                    </div>
+                    <div class="text" v-html="message.text.replace(/\n/g, '<br>')"></div>
                 </div>
             </div>
         </div>