diff --git a/core/modules/system/html.tpl.php b/core/modules/system/html.tpl.php
index 960eefb..824ca29 100644
--- a/core/modules/system/html.tpl.php
+++ b/core/modules/system/html.tpl.php
@@ -49,7 +49,7 @@
   </head>
   <body class="<?php print $classes; ?>" <?php print $body_attributes;?>>
     <div id="skip-link">
-      <a href="#main-content" class="element-invisible element-focusable"><?php print t('Skip to main content'); ?></a>
+      <a href="#main-content" class="<?php if(!theme_get_setting('toggle_skip_navigation')) { echo 'element-invisible element-focusable'; } ?>"><?php print t('Skip to main content'); ?></a>
     </div>
     <?php print $page_top; ?>
     <?php print $page; ?>
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 21ad1fd..58d78d1 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -406,6 +406,7 @@ function system_theme_settings($form, &$form_state, $key = '') {
     '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 20607d4..868859c 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -2664,6 +2664,7 @@ function _system_default_theme_features() {
     'comment_user_verification',
     'main_menu',
     'secondary_menu',
+    'skip_navigation',
   );
 }