diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml
index 2a613203..a09db5bd 100644
--- a/app/views/shared/_answerbox.html.haml
+++ b/app/views/shared/_answerbox.html.haml
@@ -49,7 +49,7 @@
       .row
         .col-md-6.col-md-offset-6.col-sm-8.col-sm-offset-4.col-xs-6.col-xs-offset-6.text-right
           = render 'shared/answerbox_buttons', a: a
-  -if @display_all.nil?
+  - if @display_all.nil?
     .panel-footer{id: "ab-comments-section-#{a.id}", style: 'display: none'}
       %div{id: "ab-smiles-#{a.id}"}= render 'shared/smiles', a: a
       %div{id: "ab-comments-#{a.id}"}= render 'shared/comments', a: a
diff --git a/app/views/shared/_answerbox_buttons.html.haml b/app/views/shared/_answerbox_buttons.html.haml
index d2b05016..924036ae 100644
--- a/app/views/shared/_answerbox_buttons.html.haml
+++ b/app/views/shared/_answerbox_buttons.html.haml
@@ -12,9 +12,10 @@
     %button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile', data: { a_id: a.id, action: :smile }}
       %i.fa.fa-smile-o
       %span{id: "ab-smile-count-#{a.id}"}= a.smile_count
-%button.btn.btn-primary.btn-sm{type: :button, name: 'ab-comments', data: { a_id: a.id, state: :hidden }}
-  %i.fa.fa-comments
-  %span{id: "ab-comment-count-#{a.id}"}= a.comment_count
+- unless @display_all
+  %button.btn.btn-primary.btn-sm{type: :button, name: 'ab-comments', data: { a_id: a.id, state: :hidden }}
+    %i.fa.fa-comments
+    %span{id: "ab-comment-count-#{a.id}"}= a.comment_count
 - if privileged? a.user
   %button.btn.btn-danger.btn-sm{name: 'ab-destroy', data: { a_id: a.id }}
     %i.fa.fa-trash-o
\ No newline at end of file