diff --git a/js/src/button.js b/js/src/button.js
index 3144a3f101..adcf4c9286 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -92,7 +92,10 @@ const Button = (($) => {
             input.checked = !$(this._element).hasClass(ClassName.ACTIVE)
             $(this._element).trigger('change')
           }
+
+          $(input).trigger('focus')
         }
+
       } else {
         this._element.setAttribute('aria-pressed',
           !$(this._element).hasClass(ClassName.ACTIVE))