diff --git a/templates/layout.pug b/templates/layout.pug
index f5416df..3207e6e 100644
--- a/templates/layout.pug
+++ b/templates/layout.pug
@@ -63,9 +63,9 @@ html(lang="en")
                         em.description!= description
                 block content
 
-                if comments !== "off"
-                    .isso
-                        section(id="isso-thread")
-
             if haveSidenotes
                 .sidenotes
+
+            if comments !== "off"
+                main(class=!haveSidenotes ? "fullwidth isso" : "isso")
+                    section(id="isso-thread")
\ No newline at end of file