diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index bbea594383..94720fc294 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -6246,4 +6246,8 @@ blockquote + blockquote, div > blockquote:first-child, blockquote:last-child {
 }
 .text-gray {
 	color: gray !important;
+}
+div.markdown {
+	height: auto;
+    white-space: pre-wrap;
 }
\ No newline at end of file
diff --git a/files/assets/js/comments.js b/files/assets/js/comments.js
index 9ce029adbb..5de10f53ae 100644
--- a/files/assets/js/comments.js
+++ b/files/assets/js/comments.js
@@ -6,7 +6,6 @@ function poll_vote_no_v() {
 function expandMarkdown(id,type) {
 	const ta = document.getElementById('markdown-'+id);
 	ta.classList.toggle('d-none');
-	autoExpand(ta);
 	document.getElementsByClassName('text-expand-icon-'+id)[0].classList.toggle('fa-expand-alt');
 	document.getElementsByClassName('text-expand-icon-'+id)[0].classList.toggle('fa-compress-alt');
 
diff --git a/files/templates/comments.html b/files/templates/comments.html
index cb55aca074..b50c7a2981 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -554,7 +554,7 @@
 			</div>
 
 		{% if v and v.id != c.author_id and c.body %}
-			<textarea autocomplete="off" class="d-none card border my-2 p-3 comment-box form-control rounded" id="markdown-{{c.id}}" readonly>{{c.body.strip()}}</textarea> 
+			<div autocomplete="off" class="markdown d-none card border my-2 p-3 comment-box form-control rounded" id="markdown-{{c.id}}" readonly>{{c.body.strip()}}</div> 
 		{% endif %}
 
 
@@ -885,7 +885,7 @@
 	{% include "expanded_image_modal.html" %}
 
 	<script src="{{asset('js/comments+submission_listing.js')}}"></script>
-	<script src="/assets/js/comments.js?v=259"></script>
+	<script src="/assets/js/comments.js?v=260"></script>
 
 	<script>
 		{% if p and (not v or v.highlightcomments) %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index f296ee640d..b6aeb7d9e4 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -947,7 +947,7 @@
 </div>
 
 {% if v and v.id != p.author_id and p.body and not v_forbid_deleted %}
-	<textarea autocomplete="off" class="d-none card border my-2 p-3 comment-box form-control rounded" id="markdown-{{p.id}}" readonly>{{p.body.strip()}}</textarea> 
+	<div autocomplete="off" class="markdown d-none card border my-2 p-3 comment-box form-control rounded" id="markdown-{{p.id}}" readonly>{{p.body.strip()}}</div> 
 {% endif %}
 
 <div class="row border-md-0 comment-section pb-3">
diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html
index e6a7d72349..1526c7ada2 100644
--- a/files/templates/util/assetcache.html
+++ b/files/templates/util/assetcache.html
@@ -1,6 +1,6 @@
 {%-
 set CACHE_VER = {
-	'css/main.css': 497,
+	'css/main.css': 498,
 	'css/catalog.css': 2,
 
 	'css/4chan.css': 61,