diff --git a/_config.yml b/_config.yml
index 102c3a8..a0bbd52 100644
--- a/_config.yml
+++ b/_config.yml
@@ -6,7 +6,6 @@ description: A simple and clean responsive Jekyll theme for words and photos.
 logo: site-logo.png
 url: //mmistakes.github.io/so-simple-theme
 
-
 # Jekyll configuration
 
 permalink:   /:categories/:title/
diff --git a/_includes/scripts.html b/_includes/scripts.html
index bed3b4d..0793834 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -23,7 +23,3 @@
   })();
 </script>
 {% endif %}
-
-{% if page.comments or site.comments %}
-  {% include disqus_comments.html %}
-{% endif %}
diff --git a/_layouts/post.html b/_layouts/post.html
index 4ee708b..4fef55b 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -41,7 +41,10 @@
       </footer>
       <div class="entry-content">
         {{ content }}
-        {% if (site.owner.disqus-shortname and page.comments) or site.comments %}<div id="disqus_thread"></div><!-- /#disqus_thread -->{% endif %}
+        {% if (site.owner.disqus-shortname and page.comments) or site.comments %}
+          <div id="disqus_thread"></div><!-- /#disqus_thread -->
+          {% include disqus_comments.html %}
+        {% endif %}
       </div><!-- /.entry-content -->
     </div><!-- /.entry-wrapper -->
     <nav class="pagination" role="navigation">