diff --git a/app/views/proposals/_filter_subnav.html.erb b/app/views/proposals/_filter_subnav.html.erb
index 6347d56b0..b15c26efc 100644
--- a/app/views/proposals/_filter_subnav.html.erb
+++ b/app/views/proposals/_filter_subnav.html.erb
@@ -1,22 +1,25 @@
-<div class="row">
-  <div class="small-12 column">
-    <ul class="tabs" data-tabs id="proposals-tabs">
-      <li class="tabs-title is-active">
-        <%= link_to "#tab-comments" do %>
-          <h3>
-            <%= t("proposals.show.comments_tab") %>
-            <span class="js-comments-count">(<%= @proposal.comments_count %>)</span>
-          </h3>
-        <% end %>
-      </li>
-      <li class="tabs-title">
-      <%= link_to "#tab-notifications" do %>
-        <h3>
-          <%= t("proposals.show.notifications_tab") %>
-          (<%= @notifications.count %>)
-        </h3>
-      <% end %>
-      </li>
-    </ul>
-  </div>
-</div>
+<ul class="tabs"
+    id="proposals_tabs"
+    role="tablist"
+    data-deep-link="true"
+    data-update-history="true"
+    data-deep-link-smudge="true"
+    data-deep-link-smudge="500"
+    data-tabs>
+  <li class="tabs-title is-active">
+    <%= link_to "#tab-comments" do %>
+      <h3>
+        <%= t("proposals.show.comments_tab") %>
+        <span class="js-comments-count">(<%= @proposal.comments_count %>)</span>
+      </h3>
+    <% end %>
+  </li>
+  <li class="tabs-title">
+    <%= link_to "#tab-notifications" do %>
+      <h3>
+        <%= t("proposals.show.notifications_tab") %>
+        (<%= @notifications.count %>)
+      </h3>
+    <% end %>
+  </li>
+</ul>
diff --git a/app/views/proposals/_notifications.html.erb b/app/views/proposals/_notifications.html.erb
index 69389b2c5..6a693c601 100644
--- a/app/views/proposals/_notifications.html.erb
+++ b/app/views/proposals/_notifications.html.erb
@@ -1,4 +1,4 @@
-<div class="tabs-panel" id="tab-notifications">
+<div class="tabs-panel" id="tab-notifications" role="tab">
   <div class="row">
     <div class="small-12 column">
       <% if @notifications.blank? %>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 3fdd52937..58a02c973 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -206,11 +206,16 @@
   </div>
 <% end %>
 
-<div class="tabs-content" data-tabs-content="proposals-tabs" role="tablist">
-  <%= render "proposals/filter_subnav" %>
-  <%= render "proposals/notifications" %>
-
-  <div class="tabs-panel is-active" id="tab-comments">
-    <%= render "proposals/comments" %>
+<div class="row">
+  <div class="small-12 column">
+    <%= render "proposals/filter_subnav" %>
   </div>
 </div>
+
+<div class="tabs-content" data-tabs-content="proposals_tabs">
+  <div class="tabs-panel is-active" id="tab-comments" role="tab">
+    <%= render "proposals/comments" %>
+  </div>
+
+  <%= render "proposals/notifications" %>
+</div>