diff --git a/app/views/admin/poll/booth_assignments/index.html.erb b/app/views/admin/poll/booth_assignments/index.html.erb
index e17281c98..c96f6ba3d 100644
--- a/app/views/admin/poll/booth_assignments/index.html.erb
+++ b/app/views/admin/poll/booth_assignments/index.html.erb
@@ -1,6 +1,6 @@
 <%= render "/admin/poll/polls/poll_header" %>
 <div id="poll-resources">
-  <%= render "/admin/poll/polls/filter_subnav" %>
+  <%= render "/admin/poll/polls/subnav" %>
   <%= render "search_booths" %>
 
   <h3><%= t("admin.poll_booth_assignments.index.booths_title") %></h3>
diff --git a/app/views/admin/poll/officer_assignments/index.html.erb b/app/views/admin/poll/officer_assignments/index.html.erb
index db3dfd6db..e4c3e3052 100644
--- a/app/views/admin/poll/officer_assignments/index.html.erb
+++ b/app/views/admin/poll/officer_assignments/index.html.erb
@@ -1,6 +1,7 @@
 <%= render "/admin/poll/polls/poll_header" %>
 <div id="poll-resources">
-  <%= render "/admin/poll/polls/filter_subnav" %>
+  <%= render "/admin/poll/polls/subnav" %>
+
   <%= render "search_officers" %>
 
   <h3><%= t("admin.poll_officer_assignments.index.officers_title") %></h3>
diff --git a/app/views/admin/poll/polls/_filter_subnav.html.erb b/app/views/admin/poll/polls/_filter_subnav.html.erb
deleted file mode 100644
index ecc352d5d..000000000
--- a/app/views/admin/poll/polls/_filter_subnav.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-<ul class="menu simple clear" id="assigned-resources-tabs">
-  <li>
-    <%= link_to admin_poll_path(@poll) do %>
-      <%= t("admin.polls.show.questions_tab") %>
-      (<%= @poll.questions.count %>)
-    <% end %>
-  </li>
-  <li>
-    <%= link_to admin_poll_booth_assignments_path(@poll) do %>
-      <%= t("admin.polls.show.booths_tab") %>
-      (<%= @poll.booth_assignments.select(:booth_id).distinct.count %>)
-    <% end %>
-  </li>
-  <li>
-    <%= link_to admin_poll_officer_assignments_path(@poll) do %>
-      <%= t("admin.polls.show.officers_tab") %>
-      (<%= @poll.officer_assignments.select(:officer_id).distinct.count %>)
-    <% end %>
-  </li>
-  <li>
-    <%= link_to admin_poll_recounts_path(@poll) do %>
-      <%= t("admin.polls.show.recounts_tab") %>
-    <% end %>
-  </li>
-  <li>
-    <%= link_to admin_poll_results_path(@poll) do %>
-      <%= t("admin.polls.show.results_tab") %>
-    <% end %>
-  </li>
-</ul>
diff --git a/app/views/admin/poll/polls/_subnav.html.erb b/app/views/admin/poll/polls/_subnav.html.erb
new file mode 100644
index 000000000..7d79b5ba5
--- /dev/null
+++ b/app/views/admin/poll/polls/_subnav.html.erb
@@ -0,0 +1,63 @@
+<ul class="menu simple clear" id="assigned-resources-tabs">
+  <% if controller_name == "polls" %>
+    <li class="active">
+        <%= t("admin.polls.show.questions_tab") %>
+        (<%= @poll.questions.count %>)
+    </li>
+  <% else %>
+    <li>
+      <%= link_to admin_poll_path(@poll) do %>
+        <%= t("admin.polls.show.questions_tab") %>
+        (<%= @poll.questions.count %>)
+      <% end %>
+    </li>
+  <% end %>
+
+  <% if controller_name == "booth_assignments" %>
+    <li class="active">
+      <%= t("admin.polls.show.booths_tab") %>
+      (<%= @poll.booth_assignments.select(:booth_id).distinct.count %>)
+    </li>
+  <% else %>
+    <li>
+      <%= link_to admin_poll_booth_assignments_path(@poll) do %>
+        <%= t("admin.polls.show.booths_tab") %>
+        (<%= @poll.booth_assignments.select(:booth_id).distinct.count %>)
+      <% end %>
+    </li>
+  <% end %>
+
+  <% if controller_name == "officer_assignments" %>
+    <li class="active">
+      <%= t("admin.polls.show.officers_tab") %>
+      (<%= @poll.officer_assignments.select(:officer_id).distinct.count %>)
+    </li>
+  <% else %>
+    <li>
+      <%= link_to admin_poll_officer_assignments_path(@poll) do %>
+        <%= t("admin.polls.show.officers_tab") %>
+        (<%= @poll.officer_assignments.select(:officer_id).distinct.count %>)
+      <% end %>
+    </li>
+  <% end %>
+
+  <% if controller_name == "recounts" %>
+    <li class="active">
+      <%= t("admin.polls.show.recounts_tab") %>
+    </li>
+  <% else %>
+    <li>
+      <%= link_to t("admin.polls.show.recounts_tab"), admin_poll_recounts_path(@poll) %>
+    </li>
+  <% end %>
+
+  <% if controller_name == "results" %>
+    <li class="active">
+      <%= t("admin.polls.show.results_tab") %>
+    </li>
+  <% else %>
+    <li>
+      <%= link_to t("admin.polls.show.results_tab"), admin_poll_results_path(@poll) %>
+    </li>
+  <% end %>
+</ul%>
diff --git a/app/views/admin/poll/polls/show.html.erb b/app/views/admin/poll/polls/show.html.erb
index 2807d73ca..93ce52e47 100644
--- a/app/views/admin/poll/polls/show.html.erb
+++ b/app/views/admin/poll/polls/show.html.erb
@@ -1,7 +1,7 @@
 <%= render "poll_header" %>
 
 <div id="poll-resources">
-  <%= render "filter_subnav" %>
+  <%= render "subnav" %>
 
   <%= render "search_questions" %>
   <%= render "questions" %>
diff --git a/app/views/admin/poll/recounts/index.html.erb b/app/views/admin/poll/recounts/index.html.erb
index 796a3efbf..bb1f90364 100644
--- a/app/views/admin/poll/recounts/index.html.erb
+++ b/app/views/admin/poll/recounts/index.html.erb
@@ -1,6 +1,6 @@
 <%= render "/admin/poll/polls/poll_header" %>
 <div id="poll-resources">
-  <%= render "/admin/poll/polls/filter_subnav" %>
+  <%= render "/admin/poll/polls/subnav" %>
 
   <h3><%= t("admin.recounts.index.title") %></h3>
 
diff --git a/app/views/admin/poll/results/index.html.erb b/app/views/admin/poll/results/index.html.erb
index 3e6ca64a5..9d3a6abef 100644
--- a/app/views/admin/poll/results/index.html.erb
+++ b/app/views/admin/poll/results/index.html.erb
@@ -1,6 +1,6 @@
 <%= render "/admin/poll/polls/poll_header" %>
 <div id="poll-resources">
-  <%= render "/admin/poll/polls/filter_subnav" %>
+  <%= render "/admin/poll/polls/subnav" %>
 
   <h3><%= t("admin.results.index.title") %></h3>