diff --git a/core/modules/system/templates/maintenance-page.html.twig b/core/modules/system/templates/maintenance-page.html.twig
index 3b5a59e..4916b21 100644
--- a/core/modules/system/templates/maintenance-page.html.twig
+++ b/core/modules/system/templates/maintenance-page.html.twig
@@ -11,6 +11,20 @@
  * @ingroup themeable
  */
 #}
+<!DOCTYPE html>
+<html{{ html_attributes }}>
+<head>
+  {{ head }}
+  <title>{{ head_title }}</title>
+  {{ styles }}
+  {{ 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">
 
   <header role="banner">
@@ -37,6 +51,7 @@
   </header>
 
   <main role="main">
+    <a id="main-content" tabindex="-1"></a>
     {% if title %}
       <h1>{{ title }}</h1>
     {% endif %}
@@ -64,4 +79,4 @@
     </footer>
   {% endif %}
 
-</div>{# /.l-container #}
+</div>{# /.l-container #}
\ No newline at end of file
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 b075295..328ef68 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -143,7 +143,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 bbc804f..a7175d9 100644
--- a/core/themes/seven/templates/page.html.twig
+++ b/core/themes/seven/templates/page.html.twig
@@ -84,7 +84,7 @@
     {{ breadcrumb }}
 
     <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 %}
