diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 80ac16e..72cc1de 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -34,24 +34,7 @@
     {{ end }}
 
     {{ if .Site.Params.isso.enabled }}
-      <article class="post">
-        <script
-            data-isso="{{ .Site.Params.isso.data }}"
-            data-isso-id="{{ .Site.Params.isso.id}}"
-            data-isso-css="{{ .Site.Params.isso.css }}"
-            data-isso-lang="{{ .Site.Params.isso.lang }}"
-            data-isso-reply-to-self="{{ .Site.Params.isso.replyToSelf }}"
-            data-isso-require-author="{{ .Site.Params.isso.requireAuthor }}"
-            data-isso-require-email="{{ .Site.Params.isso.requireEmail }}"
-            data-isso-avatar="{{ .Site.Params.isso.avatar }}"
-            data-isso-avatar-bg="{{ .Site.Params.isso.avatarBg }}"
-            src="{{ .Site.Params.isso.jsLocation }}">
-        </script>
-        <noscript>Please enable JavaScript to view the comments powered by <a href="https://posativ.org/isso/">Isso</a>.</noscript>
-        <div>
-          <section id="isso-thread"></section>
-        </div>
-      </article>
+        {{ partial "isso.html" . }}
     {{ end }}
 
 {{ end }}
diff --git a/layouts/partials/isso.html b/layouts/partials/isso.html
new file mode 100644
index 0000000..2e03b0f
--- /dev/null
+++ b/layouts/partials/isso.html
@@ -0,0 +1,18 @@
+<article class="post">
+<script
+    data-isso="{{ .Site.Params.isso.data }}"
+    data-isso-id="{{ .Site.Params.isso.id}}"
+    data-isso-css="{{ .Site.Params.isso.css }}"
+    data-isso-lang="{{ .Site.Params.isso.lang }}"
+    data-isso-reply-to-self="{{ .Site.Params.isso.replyToSelf }}"
+    data-isso-require-author="{{ .Site.Params.isso.requireAuthor }}"
+    data-isso-require-email="{{ .Site.Params.isso.requireEmail }}"
+    data-isso-avatar="{{ .Site.Params.isso.avatar }}"
+    data-isso-avatar-bg="{{ .Site.Params.isso.avatarBg }}"
+    src="{{ .Site.Params.isso.jsLocation }}">
+</script>
+<noscript>Please enable JavaScript to view the comments powered by <a href="https://posativ.org/isso/">Isso</a>.</noscript>
+<div>
+  <section id="isso-thread"></section>
+</div>
+</article>