diff --git a/components/index.html b/components/index.html
index 1d43ca1a1a..5a874cc64a 100644
--- a/components/index.html
+++ b/components/index.html
@@ -54,7 +54,7 @@
 
   </head>
   <body>
-    <a class="sr-only sr-only-focusable" href="#content">Skip to main content</a>
+    <a id="skippy" class="sr-only sr-only-focusable" href="#content"><div class="container"><span class="skiplink-text">Skip to main content</span></div></a>
 
     <!-- Docs master nav -->
     <header class="navbar navbar-static-top bs-docs-nav" id="top" role="banner">
diff --git a/css/index.html b/css/index.html
index 8afcc0c99e..a1128076fd 100644
--- a/css/index.html
+++ b/css/index.html
@@ -54,7 +54,7 @@
 
   </head>
   <body>
-    <a class="sr-only sr-only-focusable" href="#content">Skip to main content</a>
+    <a id="skippy" class="sr-only sr-only-focusable" href="#content"><div class="container"><span class="skiplink-text">Skip to main content</span></div></a>
 
     <!-- Docs master nav -->
     <header class="navbar navbar-static-top bs-docs-nav" id="top" role="banner">
diff --git a/index.html b/index.html
index b4dec6f0d6..806d8cad82 100644
--- a/index.html
+++ b/index.html
@@ -49,7 +49,7 @@
 
   </head>
   <body class="bs-docs-home">
-    <a class="sr-only sr-only-focusable" href="#content">Skip to main content</a>
+    <a id="skippy" class="sr-only sr-only-focusable" href="#content"><div class="container"><span class="skiplink-text">Skip to main content</span></div></a>
 
     <!-- Docs master nav -->
     <header class="navbar navbar-static-top bs-docs-nav" id="top" role="banner">
diff --git a/javascript/index.html b/javascript/index.html
index 895350377f..e3e5a0a5e7 100644
--- a/javascript/index.html
+++ b/javascript/index.html
@@ -54,7 +54,7 @@
 
   </head>
   <body>
-    <a class="sr-only sr-only-focusable" href="#content">Skip to main content</a>
+    <a id="skippy" class="sr-only sr-only-focusable" href="#content"><div class="container"><span class="skiplink-text">Skip to main content</span></div></a>
 
     <!-- Docs master nav -->
     <header class="navbar navbar-static-top bs-docs-nav" id="top" role="banner">
