diff --git a/templates/page.html b/templates/page.html
index 736c526..dc79ab0 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -322,11 +322,6 @@ Current section extra: {% if current_section %}{{ current_section.extra | json_e
         {% set enabled_systems = 0 %}
         {% set comment_system = "" %}
 
-        {# Webmentions #}
-        {%- if config.extra.webmentions.enable -%}
-            {%- include "partials/webmentions.html" -%} 
-        {%- endif -%}
-
         {% for system in systems %}
             {% set global_enabled = config.extra[system].enabled_for_all_posts | default(value=false) %}
             {% set page_enabled = page.extra[system] | default(value=global_enabled) %}
@@ -345,6 +340,11 @@ Current section extra: {% if current_section %}{{ current_section.extra | json_e
             {% include "partials/comments.html" %}
         {% endif %}
 
+        {# Webmentions #}
+        {%- if config.extra.webmentions.enable -%}
+            {%- include "partials/webmentions.html" -%}
+        {%- endif -%}
+
     </article>
 </main>
 
diff --git a/templates/partials/extra_features.html b/templates/partials/extra_features.html
index 2662b92..2dec211 100644
--- a/templates/partials/extra_features.html
+++ b/templates/partials/extra_features.html
@@ -21,9 +21,16 @@
             </div>
         {% endif %}
 
-        {# Button to go to the comment section #}
-        {% if comment_system %}
-            <a href="#comments" id="comments-button" class="no-hover-padding" title="{{ macros_translate::translate(key="go_to_comments", default="Go to comments section", language_strings=language_strings) }}">
+        {# Button to go to the comment/webmentions section #}
+        {% if comment_system or config.extra.webmentions.enable %}
+            {%- if comment_system -%}
+                {#- Comments are shown above webmentions -#}
+                {%- set comments_id = "comments" -%}
+            {%- else -%}
+                {%- set comments_id = "webmentions" -%}
+            {%- endif -%}
+
+            <a href="#{{- comments_id -}}" id="comments-button" class="no-hover-padding" title="{{ macros_translate::translate(key="go_to_comments", default="Go to comments section", language_strings=language_strings) }}">
                 <svg viewBox="0 0 20 20" fill="currentColor"><path d="M18 10c0 3.866-3.582 7-8 7a8.841 8.841 0 01-4.083-.98L2 17l1.338-3.123C2.493 12.767 2 11.434 2 10c0-3.866 3.582-7 8-7s8 3.134 8 7zM7 9H5v2h2V9zm8 0h-2v2h2V9zM9 9h2v2H9V9z" clip-rule="evenodd" fill-rule="evenodd"/></svg>
             </a>
         {% endif %}