diff --git a/core/modules/system/templates/page.html.twig b/core/modules/system/templates/page.html.twig
index f7524f8756bb41dd8cdd347893ac176aabddc58d..032b724dfe71e8bb91120063aab5822deb09b97e 100644
--- a/core/modules/system/templates/page.html.twig
+++ b/core/modules/system/templates/page.html.twig
@@ -60,7 +60,8 @@
 
   {{ page.help }}
 
-  <main id="main-content" role="main" tabindex="-1">{# link is in html.html.twig #}
+  <main role="main">
+    <a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
 
     <div class="layout-content">
       {{ page.content }}
diff --git a/core/themes/bartik/templates/maintenance-page.html.twig b/core/themes/bartik/templates/maintenance-page.html.twig
index 2b17f621922b43acd6e0f354aab37617304b40b7..3cd787b33d01a738d15495d3416776ea948cc292 100644
--- a/core/themes/bartik/templates/maintenance-page.html.twig
+++ b/core/themes/bartik/templates/maintenance-page.html.twig
@@ -32,8 +32,9 @@
     </header>
     <div id="main-wrapper">
       <div id="main" class="clearfix">
-        <main id="content" class="column" role="main" tabindex="-1">
-          <section class="section" id="main-content">
+        <main id="content" class="column" role="main">
+          <section class="section">
+            <a id="main-content"></a>
             {% if title %}
               <h1 class="title" id="page-title">{{ title }}</h1>
             {% endif %}
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 046706a88339f5c375d415cdddca4999a29762e1..023204f4fc9b0d84dbbc837ddc1df0efe815b02d 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -76,8 +76,9 @@
     <div id="main-wrapper" class="layout-main-wrapper layout-container clearfix">
       <div id="main" class="layout-main clearfix">
         {{ page.breadcrumb }}
-        <main id="content" class="column main-content" role="main" tabindex="-1">
-          <section class="section" id="main-content">
+        <main id="content" class="column main-content" role="main">
+          <section class="section">
+            <a id="main-content" tabindex="-1"></a>
             {{ page.content }}
           </section>
         </main>
diff --git a/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig
index c66dc0bcd3306226c9607e617a8680ed4a993516..1a1a89b0c31e822478dea33dc35ffa7a7213e720 100644
--- a/core/themes/seven/templates/page.html.twig
+++ b/core/themes/seven/templates/page.html.twig
@@ -48,7 +48,8 @@
   <div class="layout-container">
     {{ page.pre_content }}
     {{ page.breadcrumb }}
-    <main class="page-content clearfix" id="main-content" role="main" tabindex="-1">
+    <main class="page-content clearfix" role="main">
+      <div class="visually-hidden"><a id="main-content" tabindex="-1"></a></div>
       {{ page.highlighted }}
       {% if page.help %}
         <div class="help">