diff --git a/static/css/pad.css b/static/css/pad.css
index 2a7aad4..a334e16 100755
--- a/static/css/pad.css
+++ b/static/css/pad.css
@@ -73,6 +73,10 @@ li[data-key=showusers] > a #online_count {
     display: none;
 }
 
+.buttonicon:focus {
+    border: none !important;
+}
+
 /* Restyle the toolbar */
 .toolbar {
     background: transparent;
@@ -144,13 +148,16 @@ li[data-key=showusers] > a #online_count {
     width: 25px;
 }
 
-.toolbar ul li a:hover .buttonicon {
+.toolbar ul li a:hover .buttonicon,
+.toolbar ul li a .buttonicon:focus {
     color: #999;
 }
 
-.toolbar ul li a .buttonicon:focus {
-    border: 0;
-    outline: none;
+.toolbar ul li a .buttonicon:focus,
+.toolbar ul li select:focus {
+    outline: thin dotted;
+    outline: 5px auto -webkit-focus-ring-color;
+    outline-offset: -2px;
 }
 
 /* Additional icons added by OAE */
diff --git a/static/js/index.js b/static/js/index.js
index 44764d9..bc22ed8 100755
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -16,8 +16,8 @@ exports.postAceInit = function (hook_name, args, cb) {
     $('.buttonicon-showusers').removeClass('buttonicon-showusers').addClass('buttonicon-oae buttonicon-user');
 
     // Add extra buttons to the toolbar *after* the style select
-    $('ul.menu_left').append('<li data-type="button" data-key="colorcheck"><a class="grouped-left" data-l10n-id="pad.settings.colorcheck" title="Toggle authorship colors"><button class="buttonicon buttonicon-oae buttonicon-clearauthorship"></button></a></li>');
-    $('ul.menu_left').append('<li data-type="button" data-key="download"><a target="_blank" href="' + window.location.pathname + '/export/pdf" class="grouped-right" data-l10n-id="pad.importExport.exportpdf" title="Download"><button class="buttonicon buttonicon-oae buttonicon-download"></button></a></li>');
+    $('ul.menu_left').append('<li data-type="button" data-key="colorcheck"><a class="grouped-left" data-l10n-id="pad.settings.colorcheck" title="Toggle authorship colors"><button class="buttonicon buttonicon-oae buttonicon-clearauthorship" title="Toggle authorship colors"></button></a></li>');
+    $('ul.menu_left').append('<li data-type="button" data-key="download"><a target="_blank" href="' + window.location.pathname + '/export/pdf" class="grouped-right" data-l10n-id="pad.importExport.exportpdf" title="Download"><button class="buttonicon buttonicon-oae buttonicon-download" title="Download"></button></a></li>');
 
     // Show the toolbar
     $('.toolbar').animate({
@@ -27,6 +27,9 @@ exports.postAceInit = function (hook_name, args, cb) {
     $('#editorcontainerbox').animate({
         'top': '55px',
     }, 500);
+    
+    // Disable tabbing to download link since there's a button within it
+    $('.toolbar [data-key="download"] a').attr('tabindex','-1');
 
     // Enable the spellchecker
     $('iframe[name="ace_outer"]').contents().find('iframe').contents().find('#innerdocbody').attr('spellcheck', 'true');