diff --git a/app/views/polls/_comments.html.erb b/app/views/polls/_comments.html.erb
new file mode 100644
index 000000000..09b59cee6
--- /dev/null
+++ b/app/views/polls/_comments.html.erb
@@ -0,0 +1,24 @@
+<% cache [locale_and_user_status, @current_order, commentable_cache_key(@poll), @comment_tree.comments, @comment_tree.comment_authors, @poll.comments_count, @comment_flags] do %>
+  <div class="row comments">
+    <div id="comments" class="small-12 column">
+      <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %>
+
+      <% if user_signed_in? %>
+        <%= render 'comments/form', {commentable: @poll, parent_id: nil, toggeable: false} %>
+      <% else %>
+      <br>
+
+      <div data-alert class="callout primary">
+        <%= t("polls.show.login_to_comment",
+            signin: link_to(t("votes.signin"), new_user_session_path),
+            signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+        </div>
+      <% end %>
+
+      <% @comment_tree.root_comments.each do |comment| %>
+        <%= render 'comments/comment', comment: comment  %>
+      <% end %>
+      <%= paginate @comment_tree.root_comments %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/shared/_comments.html.erb b/app/views/shared/_comments.html.erb
deleted file mode 100644
index db097a7c4..000000000
--- a/app/views/shared/_comments.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-<% cache [locale_and_user_status, @current_order, commentable_cache_key(@commentable), @comment_tree.comments, @comment_tree.comment_authors, @commentable.comments_count, @comment_flags] do %>
-  <section class="row-full comments">
-    <div class="row">
-      <div id="comments" class="small-12 column">
-        <h2>
-          <%= t("shared.comments.title") %>
-          <span class="js-comments-count">(<%= @commentable.comments_count %>)</span>
-        </h2>
-
-        <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %>
-
-        <% if user_signed_in? %>
-          <%= render 'comments/form', {commentable: @commentable, parent_id: nil, toggeable: false} %>
-        <% else %>
-        <br>
-
-        <div data-alert class="callout primary">
-          <%= t("shared.comments.login_to_comment",
-              signin: link_to(t("votes.signin"), new_user_session_path),
-              signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-          </div>
-        <% end %>
-
-        <% @comment_tree.root_comments.each do |comment| %>
-          <%= render 'comments/comment', comment: comment  %>
-        <% end %>
-        <%= paginate @comment_tree.root_comments %>
-      </div>
-    </div>
-  </section>
-<% end %>