diff --git a/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php b/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php
index 9459aad..897ec25 100644
--- a/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/ThemeSettingsForm.php
@@ -106,6 +106,7 @@ public function buildForm(array $form, array &$form_state, $theme = '') {
       'favicon' => t('Shortcut icon'),
       'main_menu' => t('Main menu'),
       'secondary_menu' => t('Secondary menu'),
+      'skip_navigation' => t('Skip navigation visible'),
     );
 
     // Some features are not always available
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 2937be2..8b6a491 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -1552,6 +1552,7 @@ function _system_default_theme_features() {
     'comment_user_verification',
     'main_menu',
     'secondary_menu',
+    'skip_navigation',
   );
 }
 
@@ -1903,6 +1904,7 @@ function system_page_alter(&$page) {
       $page[$region]['#region'] = $region;
     }
   }
+  $page['skip_navigation_visibility'] = (!theme_get_setting('toggle_skip_navigation')) ? 'element-invisible element-focusable' : '';
 }
 
 /**
diff --git a/core/modules/system/templates/html.html.twig b/core/modules/system/templates/html.html.twig
index 209b914..4f57a9f 100644
--- a/core/modules/system/templates/html.html.twig
+++ b/core/modules/system/templates/html.html.twig
@@ -35,7 +35,7 @@
     {{ scripts }}
   </head>
   <body{{ attributes }}>
-    <a href="#main-content" class="visually-hidden focusable skip-link">
+    <a href="#main-content" class="{{ skip_navigation_visibility }}">
       {{ 'Skip to main content'|t }}
     </a>
     {{ page_top }}