diff --git a/ts/editable/Mathjax.svelte b/ts/editable/Mathjax.svelte
index 86f6537e7..01d99ec71 100644
--- a/ts/editable/Mathjax.svelte
+++ b/ts/editable/Mathjax.svelte
@@ -28,12 +28,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 />
 
 <style lang="scss">
-    img {
-        vertical-align: middle;
-
-        &.block {
-            display: block;
-            margin: auto;
-        }
+    .block {
+        display: block;
+        margin: auto;
     }
 </style>
diff --git a/ts/editor/TemplateButtons.svelte b/ts/editor/TemplateButtons.svelte
index 499897512..4601fea07 100644
--- a/ts/editor/TemplateButtons.svelte
+++ b/ts/editor/TemplateButtons.svelte
@@ -101,7 +101,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     let:shortcutLabel
                 >
                     <DropdownItem
-                        on:click={() => wrapCurrent("\\(", "\\)")}
+                        on:click={() => wrapCurrent("<anki-mathjax>", "</anki-mathjax>")}
                         on:mount={withButton(createShortcut)}
                     >
                         {tr.editingMathjaxInline()}
@@ -115,7 +115,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     let:shortcutLabel
                 >
                     <DropdownItem
-                        on:click={() => wrapCurrent("\\[", "\\]")}
+                        on:click={() => wrapCurrent("<anki-mathjax block=\"true\">", "</anki-matjax>")}
                         on:mount={withButton(createShortcut)}
                     >
                         {tr.editingMathjaxBlock()}
@@ -129,7 +129,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     let:shortcutLabel
                 >
                     <DropdownItem
-                        on:click={() => wrapCurrent("\\(\\ce{", "}\\)")}
+                        on:click={() => wrapCurrent("<anki-mathjax>\\ce{", "}</anki-mathjax>")}
                         on:mount={withButton(createShortcut)}
                     >
                         {tr.editingMathjaxChemistry()}