diff --git a/index.html b/index.html
index b10b5663..0735f9c8 100644
--- a/index.html
+++ b/index.html
@@ -89,13 +89,13 @@
 
       <ul class="menu-nav u-list-unstyled">
         <li class="menu-nav-item">
-          <button class="menu-nav-button button button-block button-large active" data-target=".menu-content-area-header">Header</button>
+          <button class="menu-nav-button button button-block button-large active" data-target=".menu-content-area-header" tabindex="1">Header</button>
         </li>
         <li class="menu-nav-item">
-          <button class="menu-nav-button button button-block button-large" data-target=".menu-content-area-bookmarks">Bookmarks</button>
+          <button class="menu-nav-button button button-block button-large" data-target=".menu-content-area-bookmarks" tabindex="1">Bookmarks</button>
         </li>
         <li class="menu-nav-item">
-          <button class="menu-nav-button button button-block button-large" data-target=".menu-content-area-layout">Layout</button>
+          <button class="menu-nav-button button button-block button-large" data-target=".menu-content-area-layout" tabindex="1">Layout</button>
         </li>
       </ul>
       <div class="menu-content">
diff --git a/js/menu.js b/js/menu.js
index 627f3037..ec1bcf26 100644
--- a/js/menu.js
+++ b/js/menu.js
@@ -46,6 +46,7 @@ var menu = (function() {
     var html = helper.e("html");
     if (state.get().menu.active) {
       helper.addClass(html, "is-menu-open");
+      helper.e(".menu-nav-button.active").focus();
       shade.render({
         action: function() {
           close();