diff --git a/main/blocks.py b/main/blocks.py
index dc9d7f8c8c93a6a20c76205dc170b82e36775cb8..257ba5ba11c46fa859f203c2e4fd6aa06493fc7c 100644
--- a/main/blocks.py
+++ b/main/blocks.py
@@ -13,8 +13,9 @@ from wagtail.images.blocks import ImageChooserBlock
 from shared.blocks import CandidateBlock as SharedCandidateBlockMixin
 from shared.blocks import CandidateListBlock
 from shared.blocks import CandidateListBlock as SharedCandidateListBlockMixin
-from shared.blocks import \
-    CandidateSecondaryListBlock as SharedCandidateSecondaryListBlockMixin
+from shared.blocks import (
+    CandidateSecondaryListBlock as SharedCandidateSecondaryListBlockMixin,
+)
 from shared.blocks import (
     CardLinkBlockMixin,
     CardLinkWithHeadlineBlockMixin,
@@ -27,8 +28,9 @@ from shared.blocks import (
     ProgramGroupBlockMixin,
 )
 from shared.blocks import ProgramGroupBlockPopout as SharedProgramGroupBlockPopout
-from shared.blocks import \
-    ProgramGroupWithCandidatesBlock as SharedProgramGroupWithCandidatesBlockMixin
+from shared.blocks import (
+    ProgramGroupWithCandidatesBlock as SharedProgramGroupWithCandidatesBlockMixin,
+)
 from shared.blocks import SecondaryCandidateBlock as SharedSecondaryCandidateBlockMixin
 from shared.blocks import StreamBlock, TeamBlockMixin
 
diff --git a/shared/templates/styleguide2/includes/organisms/layout/navbar.html b/shared/templates/styleguide2/includes/organisms/layout/navbar.html
index 8e6583feedb40fa3d390cb45d7fbab3b53be47e0..6f86dc2b89e0e50794117ea3fc4a29e727b1de2b 100644
--- a/shared/templates/styleguide2/includes/organisms/layout/navbar.html
+++ b/shared/templates/styleguide2/includes/organisms/layout/navbar.html
@@ -294,17 +294,19 @@
             </div>
           {% endif %}
 
-          {% if page.root_page.popout_button_name %}
+          {% if page.root_page.popout_button_content %}
             <div class="mb-6 flex flex-col gap-1.5">
-              {% for popout_button_link in page.root_page.popout_button_content %}
+              {% for button in page.root_page.popout_button_content %}
                 <a
-                  href="{{ popout_button_link.url }}"
+                  href="{{ button.value.button_link }}"
                   class="
                     decoration-1 underline-offset-4
 
                     navbar__menu-item
+
+                    {% if button.value.button_text == selected_item %}navbar__menu-item--selected{% endif %}
                   "
-                >{{ popout_button_link.name }}</a>
+                >{{ button.value.button_text }}</a>
               {% endfor %}
             </div>
           {% endif %}