diff --git a/core/modules/system/templates/maintenance-page.html.twig b/core/modules/system/templates/maintenance-page.html.twig
index b71fa24..40511b5 100644
--- a/core/modules/system/templates/maintenance-page.html.twig
+++ b/core/modules/system/templates/maintenance-page.html.twig
@@ -21,6 +21,11 @@
   {{ scripts }}
 </head>
 <body class="{{ attributes.class }}">
+<div id="skip-link">
+  <a href="#main-content" class="visually-hidden focusable">
+    {{ 'Skip to main content'|t }}
+  </a>
+</div>
 
 <div class="l-container">
 
@@ -48,6 +53,7 @@
   </header>
 
   <main role="main">
+    <a id="main-content" tabindex="-1"></a>
     {% if title %}
       <h1>{{ title }}</h1>
     {% endif %}
diff --git a/core/modules/system/templates/page.html.twig b/core/modules/system/templates/page.html.twig
index 1f6f916..fc8752e 100644
--- a/core/modules/system/templates/page.html.twig
+++ b/core/modules/system/templates/page.html.twig
@@ -109,7 +109,7 @@
   {{ page.help }}
 
   <main role="main">
-    <a id="main-content"></a>{# link is in html.html.twig #}
+    <a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
 
     <div class="l-content">
       {{ page.highlighted }}
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 5602997..366d345 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -145,7 +145,7 @@
 
     <main id="content" class="column" role="main"><section class="section">
       {% if page.highlighted %}<div id="highlighted">{{ page.highlighted }}</div>{% endif %}
-      <a id="main-content"></a>
+      <a id="main-content" tabindex="-1"></a>
       {{ title_prefix }}
         {% if title %}
           <h1 class="title" id="page-title">
diff --git a/core/themes/seven/templates/page.html.twig b/core/themes/seven/templates/page.html.twig
index 5a50431..4d63c1c 100644
--- a/core/themes/seven/templates/page.html.twig
+++ b/core/themes/seven/templates/page.html.twig
@@ -83,7 +83,7 @@
     {% endif %}
 
     <main id="content" class="clearfix" role="main">
-      <div class="visually-hidden"><a id="main-content"></a></div>
+      <div class="visually-hidden"><a id="main-content" tabindex="-1"></a></div>
       {% if messages %}
         <div id="console" class="clearfix">{{ messages }}</div>
       {% endif %}
