diff --git a/src/readtheorg_theme/js/readtheorg.js b/src/readtheorg_theme/js/readtheorg.js
index ea85c70..ce95b48 100644
--- a/src/readtheorg_theme/js/readtheorg.js
+++ b/src/readtheorg_theme/js/readtheorg.js
@@ -20,10 +20,9 @@ $( document ).ready(function() {
 
 $(function() {
     function replace_admonition (tag, readable) {
-        $(`.${tag}:not(#table-of-contents *)`)
-            .parent().parent().replaceWith(function() {
-                return `<p id='${this.id}' class='admonition-title ${tag}'>${readable}</p>`
-            });
+        $(`span.${tag}:not(#table-of-contents *)`) .parent().parent()
+            .replaceWith(`<p id='${this.id}' class='admonition-title ${tag}'>${readable}</p>`);
+        $(`div.${tag}`).before(`<p class='admonition-title ${tag}'>${readable}</p>`)
     }
     replace_admonition('note', 'Note');
     replace_admonition('seealso', 'See also');
diff --git a/src/readtheorg_theme/readtheorg.org b/src/readtheorg_theme/readtheorg.org
index 8498992..fe167c2 100644
--- a/src/readtheorg_theme/readtheorg.org
+++ b/src/readtheorg_theme/readtheorg.org
@@ -1491,10 +1491,9 @@ $( document ).ready(function() {
 
 $(function() {
     function replace_admonition (tag, readable) {
-        $(`.${tag}:not(#table-of-contents *)`)
-            .parent().parent().replaceWith(function() {
-                return `<p id='${this.id}' class='admonition-title ${tag}'>${readable}</p>`
-            });
+        $(`span.${tag}:not(#table-of-contents *)`) .parent().parent()
+            .replaceWith(`<p id='${this.id}' class='admonition-title ${tag}'>${readable}</p>`);
+        $(`div.${tag}`).before(`<p class='admonition-title ${tag}'>${readable}</p>`)
     }
     replace_admonition('note', 'Note');
     replace_admonition('seealso', 'See also');