diff --git a/files/__main__.py b/files/__main__.py
index 734912737..9f4231d30 100644
--- a/files/__main__.py
+++ b/files/__main__.py
@@ -119,5 +119,7 @@ def after_request(response):
 	response.headers.add("X-Frame-Options", "deny")
 	return response
 
-from files.routes.chat import *
-from files.routes import *
\ No newline at end of file
+if "load_chat" in argv:
+	from files.routes.chat import *
+else:
+	from files.routes import *
\ No newline at end of file
diff --git a/files/assets/js/comments.js b/files/assets/js/comments.js
index 21b73e106..b6f82e045 100644
--- a/files/assets/js/comments.js
+++ b/files/assets/js/comments.js
@@ -1,17 +1,8 @@
 function collapse_comment(comment_id) {
-	const comment = "comment-" + comment_id
-	const element = document.getElementById(comment)
-	const closed = element.classList.toggle("collapsed")
-	const top = element.getBoundingClientRect().y
-
-	document.querySelectorAll(`#${comment} .collapsed`).forEach(n => n.classList.remove('collapsed'))
-
-	if (closed && top < 0) {
-		element.scrollIntoView()
-		window.scrollBy(0, - 100)
-	}
-
-	document.getElementById(`flaggers-${comment_id}`).classList.add('d-none')
+	const c = "#comment-" + comment_id
+	document.querySelectorAll(c).forEach(n => n.classList.toggle('collapsed'))
+	const flags = document.getElementById(`flaggers-${comment_id}`)
+	if (flags) flags.classList.add('d-none')
 };
 
 function poll_vote_no_v() {
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 7a1544048..5d0ad3313 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -856,7 +856,7 @@
 	{% include "expanded_image_modal.html" %}
 
 	<script src="/assets/js/comments+submission_listing.js?v=255"></script>
-	<script src="/assets/js/comments.js?v=254"></script>
+	<script src="/assets/js/comments.js?v=255"></script>
 
 	<script>
 		{% if p and (not v or v.highlightcomments) %}