diff --git a/files/__main__.py b/files/__main__.py
index 09e06c488..e0dde929e 100644
--- a/files/__main__.py
+++ b/files/__main__.py
@@ -117,7 +117,10 @@ def after_request(response):
 	response.headers.add("X-Frame-Options", "deny")
 	return response
 
-if "load_chat" in argv:
+if app.config["SERVER_NAME"] == 'localhost':
+	from files.routes import *
+	from files.routes.chat import *
+elif "load_chat" in argv:
 	from files.routes.chat import *
 else:
 	from files.routes import *
\ No newline at end of file
diff --git a/files/templates/chat.html b/files/templates/chat.html
index a988d79fa..f36d9ddb2 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -40,7 +40,6 @@
 		#chat-window {
 			-ms-overflow-style: none;
 			scrollbar-width: none;
-			flex-direction: column-reverse !important;
 		}
 
 		.chat-mention {
@@ -189,7 +188,7 @@
 <input id="site_name" type="hidden" value="{{SITE_NAME}}">
 <input id="slurreplacer" type="hidden" value="{{v.slurreplacer}}">
 
-<script src="/chat.js?v=18"></script>
+<script src="/chat.js?v=20"></script>
 
 {% include "emoji_modal.html" %}
 {% include "expanded_image_modal.html" %}