diff --git a/handlers.py b/handlers.py
index 11e51e0..4eaab1e 100644
--- a/handlers.py
+++ b/handlers.py
@@ -525,10 +525,10 @@ def handle_style_form(msg=""):
 
 
 def handle_style_submit(body):
-    template = body.get("template", [""])[0]
+    template = body.get("template", [""])[0].replace("\r\n", "\n").replace("\r", "\n")
     name = body.get("site_name", ["tinyweb"])[0].strip()
     sharing = "1" if body.get("sharing_enabled") else "0"
-    set_setting("custom_template", template if template.strip().replace("\r\n", "\n") != DEFAULT_TEMPLATE.strip() else "")
+    set_setting("custom_template", template if template.strip() != DEFAULT_TEMPLATE.strip() else "")
     set_setting("site_name", name or "tinyweb")
     set_setting("sharing_enabled", sharing)
     return handle_style_form("Saved.")