diff --git a/html/new-thread.html b/html/new-thread.html
index ae817fd..bf23a7f 100644
--- a/html/new-thread.html
+++ b/html/new-thread.html
@@ -12,3 +12,4 @@ <h1>{{ "ThreadCreate" | translate }}</h1>
     </form>
 </main>
 {{ template "footer" . }}
+{{ template "submit-on-c-enter" . }}
diff --git a/html/script.submit-on-c-enter.html b/html/script.submit-on-c-enter.html
new file mode 100644
index 0000000..bee5c52
--- /dev/null
+++ b/html/script.submit-on-c-enter.html
@@ -0,0 +1,14 @@
+{{ define "submit-on-c-enter" }}
+<script>
+  const textareasInForms = [...document.querySelectorAll("form textarea")];
+
+  textareasInForms.forEach((textarea) => {
+    document.addEventListener("keydown", (e) => {
+      // Ctrl or Meta + Enter, to handle Mac, Linux, and Windows
+      if (e.keyCode == 13 && (e.metaKey || e.ctrlKey)) {
+        e.target.closest("form").submit();
+      }
+    });
+  });
+</script>
+{{ end }}
diff --git a/html/thread.html b/html/thread.html
index 7cf9bf3..bd26cb1 100644
--- a/html/thread.html
+++ b/html/thread.html
@@ -45,3 +45,4 @@ <h1>{{ .Data.Title }}</h1>
     {{ end }}
 </main>
 {{ template "footer" . }}
+{{ template "submit-on-c-enter" . }}
diff --git a/server/server.go b/server/server.go
index eb94493..b67d18c 100644
--- a/server/server.go
+++ b/server/server.go
@@ -240,6 +240,7 @@ func generateTemplates(config types.Config, translator i18n.Translator) (*templa
 		"password-reset",
 		"change-password",
 		"change-password-success",
+		"script.submit-on-c-enter",
 	}
 
 	rootTemplate := template.New("root")