diff --git a/app/views/polls/_filter_subnav.html.erb b/app/views/polls/_filter_subnav.html.erb
new file mode 100644
index 000000000..b096edaf2
--- /dev/null
+++ b/app/views/polls/_filter_subnav.html.erb
@@ -0,0 +1,14 @@
+<div class="row">
+  <div class="small-12 column">
+    <ul class="tabs" data-tabs id="polls-tabs">
+      <li class="tabs-title is-active">
+        <%= link_to "#tab-comments" do %>
+          <h3>
+            <%= t("polls.show.comments_tab") %>
+            <span class="js-comments-count">(<%= @poll.comments_count %>)</span>
+          </h3>
+        <% end %>
+      </li>
+    </ul>
+  </div>
+</div>
diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb
index 5d60ed284..d9d871249 100644
--- a/app/views/polls/show.html.erb
+++ b/app/views/polls/show.html.erb
@@ -128,10 +128,14 @@
         </div>
       <% end %>
     </div>
-
-    <div class="tabs-panel is-active" id="tab-comments">
-      <%= render "shared/comments" %>
-    </div>
     
   </div>
 </div>
+
+<div class="tabs-content" data-tabs-content="proposals-tabs" role="tablist">
+  <%= render "filter_subnav" %>
+
+  <div class="tabs-panel is-active" id="tab-comments">
+    <%= render "comments" %>
+  </div>
+</div>
\ No newline at end of file