diff --git a/templates/partials/extra_features.html b/templates/partials/extra_features.html
index 329a6ec..46a10df 100644
--- a/templates/partials/extra_features.html
+++ b/templates/partials/extra_features.html
@@ -1,9 +1,5 @@
+{%- set page_or_section = page | default(value=section) -%}
 {# Quick navigation buttons #}
-{%- if page -%}
-    {%- set_global page_or_section = page -%}
-{%- elif section -%}
-    {%- set_global page_or_section = section -%}
-{%- endif -%}
 {% if macros_settings::evaluate_setting_priority(setting="quick_navigation_buttons", page=page_or_section, default_global_value=false) == "true" %}
     <div id="button-container">
         {# Button to go show a floating Table of Contents #}