diff --git a/_includes/comments.html b/_includes/comments.html
index 66536d25..0e33033e 100644
--- a/_includes/comments.html
+++ b/_includes/comments.html
@@ -1,11 +1,13 @@
-<h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_label }}</h4>
-{% case site.comments.provider %}
-{% when "disqus" %}
-  <section id="disqus_thread"></section>
-{% when "facebook" %}
-  <section class="fb-comments" data-href="{{ base_path }}{{ page.url }}" data-mobile="true" data-num-posts="{{ site.comments.facebook.num_posts | default: 5 }}" data-width="100%" data-colorscheme="{{ site.comments.facebook.colorscheme | default: 'light' }}"></section>
-{% when "google-plus" %}
-  <section class="g-comments" data-href="{{ base_path }}{{ page.url }}" data-first_party_property="BLOGGER" data-view_type="FILTERED_POSTMOD">Loading Google+ Comments ...</section>
-{% when "custom" %}
-  <section id="comments"></section>
-{% endcase %}
\ No newline at end of file
+<div class="page__comments">
+  <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_label }}</h4>
+  {% case site.comments.provider %}
+  {% when "disqus" %}
+    <section id="disqus_thread"></section>
+  {% when "facebook" %}
+    <section class="fb-comments" data-href="{{ base_path }}{{ page.url }}" data-mobile="true" data-num-posts="{{ site.comments.facebook.num_posts | default: 5 }}" data-width="100%" data-colorscheme="{{ site.comments.facebook.colorscheme | default: 'light' }}"></section>
+  {% when "google-plus" %}
+    <section class="g-comments" data-href="{{ base_path }}{{ page.url }}" data-first_party_property="BLOGGER" data-view_type="FILTERED_POSTMOD">Loading Google+ Comments ...</section>
+  {% when "custom" %}
+    <section id="comments"></section>
+  {% endcase %}
+</div>
\ No newline at end of file
diff --git a/assets/_scss/_page.scss b/assets/_scss/_page.scss
index 581bd7cf..e2349eda 100644
--- a/assets/_scss/_page.scss
+++ b/assets/_scss/_page.scss
@@ -35,6 +35,15 @@
     @include prefix(0.5 of 12);
     padding-right: $right-sidebar-width-wide;
   }
+
+  .page__inner-wrap {
+    .page__content,
+    .page__meta,
+    .page__share {
+      @include clearfix();
+      @include full();
+    }
+  }
 }
 
 .page__title {
@@ -161,6 +170,11 @@
    Comments
    ========================================================================== */
 
+.page__comments {
+  @include clearfix();
+  @include full();
+}
+
 .page__comments-title {
   font-size: 14px;
   margin-top: 2rem;