diff --git a/appview/pages/templates/fragments/markdownEditor.html b/appview/pages/templates/fragments/markdownEditor.html
index f2ed7930..e89db599 100644
--- a/appview/pages/templates/fragments/markdownEditor.html
+++ b/appview/pages/templates/fragments/markdownEditor.html
@@ -21,6 +21,7 @@
                 hx-post="/markup/preview"
                 hx-vals='js:{body: this.closest("markdown-editor").querySelector("textarea").value}'
                 hx-params="body"
+                hx-trigger="click"
                 hx-target="next [data-md-preview]"
                 hx-swap="innerHTML"
                 hx-indicator="this"
diff --git a/appview/pages/templates/layouts/base.html b/appview/pages/templates/layouts/base.html
index eb9d5e68..4df3a94e 100644
--- a/appview/pages/templates/layouts/base.html
+++ b/appview/pages/templates/layouts/base.html
@@ -20,8 +20,14 @@
             <meta name="author" content="Tangled" />
             <meta name="robots" content="index, follow" />
 
-            <script defer src="/static/htmx.min.js"></script>
-            <script defer src="/static/htmx-ext-ws.min.js"></script>
+            <!-- <script defer src="/static/htmx.min.js"></script> -->
+            <!-- <script defer src="/static/htmx-ext-ws.min.js"></script> -->
+            <script defer src="/static/htmx-dist/htmx.js"></script>
+            <script defer src="/static/htmx-dist/ext/htmx-2-compat.js"></script>
+            <script defer src="/static/htmx-dist/ext/hx-ws.js"></script>
+            <!-- <script src="https://cdn.jsdelivr.net/npm/htmx.org@4.0.0-beta4" integrity="sha384-aWZK1NtOs/aWb/+YZdTM8q2JkWEshlMc9mgZ189numT9bwFhyAyYEoO4nO/2dTXt" crossorigin="anonymous"></script> -->
+            <!-- <script src="https://cdn.jsdelivr.net/npm/htmx.org@next/dist/ext/htmx-2-compat.js"></script> -->
+            <!-- <script src="https://cdn.jsdelivr.net/npm/htmx.org@next/dist/ext/hx-ws.js"></script> -->
             <script defer src="/static/actor-typeahead.js" type="module"></script>
             <script defer src="/static/markdown-editor.js" type="module"></script>
             <script defer src="/static/topbar-search.js"></script>
diff --git a/appview/pages/templates/repo/issues/fragments/newComment.html b/appview/pages/templates/repo/issues/fragments/newComment.html
index 8e31c64e..7b0a3742 100644
--- a/appview/pages/templates/repo/issues/fragments/newComment.html
+++ b/appview/pages/templates/repo/issues/fragments/newComment.html
@@ -3,7 +3,7 @@
   <form
     hx-post="/comment"
     hx-swap="none"
-    hx-trigger="submit, click from:#close-button, keydown[commentButtonEnabled() && (ctrlKey || metaKey) && key=='Enter'] from:(find textarea)"
+    hx-trigger="submit, click from:#close-button, keydown[commentButtonEnabled() && (ctrlKey || metaKey) && key=='Enter'] from:find textarea"
     hx-disabled-elt="find button[type='submit']"
     hx-on::before-request="document.getElementById('comment-error').innerHTML = ''"
     hx-swap="none"
diff --git a/appview/pages/templates/repo/issues/fragments/putIssue.html b/appview/pages/templates/repo/issues/fragments/putIssue.html
index 2fb97f63..5cd1bf78 100644
--- a/appview/pages/templates/repo/issues/fragments/putIssue.html
+++ b/appview/pages/templates/repo/issues/fragments/putIssue.html
@@ -6,7 +6,7 @@
   {{ else }}
     hx-post="/{{ .RepoInfo.FullName }}/issues/new"
   {{ end }}
-  hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:(#title,#body)"
+  hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:'find input[type=text],find textarea'"
   hx-swap="none"
   class="group">
   <div class="flex flex-col gap-2">
diff --git a/appview/pages/templates/repo/pulls/fragments/pullComposeHost.html b/appview/pages/templates/repo/pulls/fragments/pullComposeHost.html
index a753eca0..a68cfabf 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullComposeHost.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullComposeHost.html
@@ -14,7 +14,7 @@
 
         <form
             hx-post="/{{ .RepoInfo.FullName }}/pulls/new"
-            hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:(#patch,#title,#body)"
+            hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:'#patch,#title,#body'"
             hx-indicator="#create-pull-spinner"
             hx-target="body"
             hx-swap="innerHTML show:top"
diff --git a/appview/pages/templates/repo/pulls/fragments/pullEdit.html b/appview/pages/templates/repo/pulls/fragments/pullEdit.html
index f6da6056..c5931a94 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullEdit.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullEdit.html
@@ -1,7 +1,7 @@
 {{ define "repo/pulls/fragments/pullEdit" }}
 <form
   hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/edit"
-  hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:(find input[type=text],find textarea)"
+  hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:'find input[type=text],find textarea'"
   hx-swap="none"
   hx-indicator="find button[type=submit]"
 >