diff --git a/cms/static/coffee/spec/main.coffee b/cms/static/coffee/spec/main.coffee
index bd349a97e3..379e5efc17 100644
--- a/cms/static/coffee/spec/main.coffee
+++ b/cms/static/coffee/spec/main.coffee
@@ -30,6 +30,7 @@ requirejs.config({
         "xmodule": "xmodule_js/src/xmodule",
         "xblock": "xmodule_js/common_static/coffee/src/xblock",
         "utility": "xmodule_js/common_static/js/src/utility",
+        "accessibility": "xmodule_js/common_static/js/src/accessibility_tools",
         "sinon": "xmodule_js/common_static/js/vendor/sinon-1.7.1",
         "squire": "xmodule_js/common_static/js/vendor/Squire",
         "jasmine-jquery": "xmodule_js/common_static/js/vendor/jasmine-jquery",
diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 7735a83297..852be14801 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -830,6 +830,20 @@ hr.divider {
   @extend %cont-text-sr;
 }
 
+/* show skip links on focus */
+#skip-link a{
+  position:absolute;
+  &:focus {
+    width: auto;
+    height: auto;
+    overflow: visible;
+    background-color: #fff;
+    border: 2px solid black;
+    padding: 3px;
+    z-index: 1005;
+  }
+}
+
 // ====================
 
 // js dependant
diff --git a/cms/templates/base.html b/cms/templates/base.html
index ded53b8188..734e4b5715 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -29,6 +29,7 @@
   </head>
 
   <body class="<%block name='bodyclass'></%block> hide-wip">
+  <div id="skip-link"><a href="#content">Skip to Content</a></div>
 <script type="text/javascript">
 window.baseUrl = "${settings.STATIC_URL}";
 var require = {
@@ -69,6 +70,7 @@ var require = {
         "xmodule": "/xmodule/xmodule",
         "xblock": "coffee/src/xblock",
         "utility": "js/src/utility",
+        "accessibility": "js/src/accessibility_tools",
         "draggabilly": "js/vendor/draggabilly.pkgd",
 
         // externally hosted files
@@ -207,7 +209,7 @@ var require = {
     deps: ["jquery", "gettext"],
     callback: function() {
         // load other scripts on every page, after jquery loads
-        require(["js/base", "coffee/src/main", "coffee/src/logger", "datepair"]);
+        require(["js/base", "coffee/src/main", "coffee/src/logger", "datepair", "accessibility"]);
         // we need "datepair" because it dynamically modifies the page
         // when it is loaded -- yuck!
     }
@@ -242,7 +244,9 @@ require(['js/models/course'], function(Course) {
 
       <div id="page-alert"></div>
 
+      <div id="content">
       <%block name="content"></%block>
+      </div>
 
       % if user.is_authenticated():
       <script type="text/javascript">
diff --git a/lms/static/js/fixtures/dashboard-fixture.html b/common/static/js/fixtures/dashboard-fixture.html
similarity index 100%
rename from lms/static/js/fixtures/dashboard-fixture.html
rename to common/static/js/fixtures/dashboard-fixture.html
diff --git a/lms/static/js/spec/accessibility_tools_spec.js b/common/static/js/spec/accessibility_tools_spec.js
similarity index 100%
rename from lms/static/js/spec/accessibility_tools_spec.js
rename to common/static/js/spec/accessibility_tools_spec.js
diff --git a/lms/static/js/src/accessibility_tools.js b/common/static/js/src/accessibility_tools.js
similarity index 92%
rename from lms/static/js/src/accessibility_tools.js
rename to common/static/js/src/accessibility_tools.js
index e77d622e97..769dbc1223 100644
--- a/lms/static/js/src/accessibility_tools.js
+++ b/common/static/js/src/accessibility_tools.js
@@ -109,3 +109,20 @@ var accessible_modal = function(trigger, closeButtonId, modalId, mainPageId) {
     });
   });
 };
+
+// handle things properly for clicks
+jQuery('#skip-link a').click(function() {
+    var href = jQuery(this).attr('href');
+    if(href) {
+        jQuery(href).focus();
+    }
+});
+// and for the enter key
+jQuery('#skip-link a').keypress(function(e) {
+    if(e.which == 13) {
+        var href = jQuery(this).attr('href');
+        if(href) {
+            jQuery(href).focus();
+        }
+    }
+});
diff --git a/common/static/js_test.yml b/common/static/js_test.yml
index 1c0fd2b2d3..117fd7f662 100644
--- a/common/static/js_test.yml
+++ b/common/static/js_test.yml
@@ -69,6 +69,6 @@ spec_paths:
 # You can access these within JavaScript code
 # at the URL: document.location.href + "/include/"
 # plus the path to the file (relative to this YAML file)
-#fixture_paths:
-#    - path/to/fixture
+fixture_paths:
+    - js/fixtures
 
diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss
index 6c32fb39b5..1e2383cb58 100644
--- a/lms/static/sass/base/_base.scss
+++ b/lms/static/sass/base/_base.scss
@@ -285,3 +285,19 @@ mark {
 #feedback_form textarea[name="details"] {
   height: 150px;
 }
+
+
+/* show skip links on focus */
+#skip-link a{
+  position:absolute;
+  &:focus {
+    width: auto;
+    height: auto;
+    overflow: visible;
+    background-color: #fff;
+    border: 2px solid black;
+    padding: 3px;
+    z-index: 1005;
+  }
+}
+
diff --git a/lms/templates/main.html b/lms/templates/main.html
index 9379844296..41d7266480 100644
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -78,6 +78,7 @@
 </head>
 
 <body class="<%block name='bodyclass'/>">
+  <div id="skip-link"><a href="#content-wrapper">Skip to Content</a></div>
   <%include file="mathjax_accessible.html" />
 
 % if theme_enabled():
@@ -86,7 +87,7 @@
   <%include file="navigation.html" />
 % endif
 
-  <section class="content-wrapper">
+  <section class="content-wrapper" id="content-wrapper">
     ${self.body()}
     <%block name="bodyextra"/>
   </section>
