diff --git a/core/modules/system/templates/page.html.twig b/core/modules/system/templates/page.html.twig
index 032b724dfe7..f7524f8756b 100644
--- a/core/modules/system/templates/page.html.twig
+++ b/core/modules/system/templates/page.html.twig
@@ -60,8 +60,7 @@
 
   {{ page.help }}
 
-  <main role="main">
-    <a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
+  <main id="main-content" role="main" tabindex="-1">{# 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 3cd787b33d0..2b17f621922 100644
--- a/core/themes/bartik/templates/maintenance-page.html.twig
+++ b/core/themes/bartik/templates/maintenance-page.html.twig
@@ -32,9 +32,8 @@
     </header>
     <div id="main-wrapper">
       <div id="main" class="clearfix">
-        <main id="content" class="column" role="main">
-          <section class="section">
-            <a id="main-content"></a>
+        <main id="content" class="column" role="main" tabindex="-1">
+          <section class="section" id="main-content">
             {% 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 023204f4fc9..046706a8833 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -76,9 +76,8 @@
     <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">
-          <section class="section">
-            <a id="main-content" tabindex="-1"></a>
+        <main id="content" class="column main-content" role="main" tabindex="-1">
+          <section class="section" id="main-content">
             {{ page.content }}
           </section>
         </main>
diff --git a/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig
index 1a1a89b0c31..c66dc0bcd33 100644
--- a/core/themes/seven/templates/page.html.twig
+++ b/core/themes/seven/templates/page.html.twig
@@ -48,8 +48,7 @@
   <div class="layout-container">
     {{ page.pre_content }}
     {{ page.breadcrumb }}
-    <main class="page-content clearfix" role="main">
-      <div class="visually-hidden"><a id="main-content" tabindex="-1"></a></div>
+    <main class="page-content clearfix" id="main-content" role="main" tabindex="-1">
       {{ page.highlighted }}
       {% if page.help %}
         <div class="help">