diff --git a/static/css/markdown.css b/static/css/markdown.css
index 0e048cf..fa716ab 100644
--- a/static/css/markdown.css
+++ b/static/css/markdown.css
@@ -2,6 +2,8 @@
 	font-size: 15px;
 	line-height: 23px;
 	color: #CAD3F5;
+	overflow: hidden;
+	word-wrap: break-word;
 }
 
 .markdown h1,
diff --git a/static/js/chat.js b/static/js/chat.js
index f8b0fa9..50850c4 100644
--- a/static/js/chat.js
+++ b/static/js/chat.js
@@ -33,8 +33,8 @@
 		jsonMode = false,
 		searchTool = false;
 
-	function scroll() {
-		if (!autoScrolling) {
+	function scroll(force = false) {
+		if (!autoScrolling && !force) {
 			return;
 		}
 
@@ -1045,7 +1045,7 @@
 	});
 
 	$bottom.addEventListener("click", () => {
-		scroll();
+		scroll(true);
 	});
 
 	$role.addEventListener("change", () => {