diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb
index 7a942f13a..278d3db7c 100644
--- a/app/views/shared/_subnavigation.html.erb
+++ b/app/views/shared/_subnavigation.html.erb
@@ -13,7 +13,7 @@
       <li>
         <%= layout_menu_link_to t("layouts.header.proposals"),
                                 proposals_path,
-                                controller_name == 'proposals',
+                                controller_name == 'proposals' || @poll&.related&.is_a?(Proposal),
                                 accesskey: "2",
                                 title: t("shared.go_to_page") + t("layouts.header.proposals") %>
       </li>
@@ -22,7 +22,7 @@
       <li>
         <%= layout_menu_link_to t("layouts.header.poll_questions"),
                                   polls_path,
-                                  controller_name == "polls" || (controller_name == "questions" && controller.class.parent == Polls),
+                                  (controller_name == "polls" && @poll&.related.nil?) || (controller_name == "questions" && controller.class.parent == Polls),
                                   accesskey: "3",
                                   title: t("shared.go_to_page") + t("layouts.header.poll_questions") %>
       </li>