diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 56fe65ca..f978918e 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -17,8 +17,6 @@
     color 0.2s $bmd-animation-curve-default;
   will-change: box-shadow, transform;
 
-  @include undo-bs-tab-focus();
-
   //--
   // Colors
 
@@ -53,7 +51,6 @@
     // :focus - Avoid outline/boxShadow on buttons after mouseup
     &.focus,
     &:focus {
-      box-shadow: none; // disable box-shadow
       outline: 0; // disable outline
     }
   }
diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss
index f5002a56..b9f45677 100644
--- a/scss/mixins/_buttons.scss
+++ b/scss/mixins/_buttons.scss
@@ -203,17 +203,3 @@
     @include bmd-raised-button-variant($btn-danger-color, $btn-danger-bg, $btn-danger-border-color);
   }
 }
-
-@mixin undo-bs-tab-focus() {
-  // clear out the tab-focus() from BS
-  &,
-  &:active,
-  &.active {
-    &:focus,
-    &.focus {
-      //@include tab-focus();
-      outline: 0;
-      box-shadow: none;
-    }
-  }
-}
diff --git a/scss/variables/bootstrap/_buttons.scss b/scss/variables/bootstrap/_buttons.scss
index 9a0ac762..275ca533 100644
--- a/scss/variables/bootstrap/_buttons.scss
+++ b/scss/variables/bootstrap/_buttons.scss
@@ -17,6 +17,8 @@ $bmd-inverse-btn-focus-bg: rgba(#ccc, .15) !default; // spec: dark bg Hover: 15%
 $bmd-inverse-btn-active-bg: rgba(#ccc, .25) !default; // spec: dark Pressed: 25% #CCCCCC
 $bmd-inverse-btn-disabled: rgba($white, .30) !default; // spec: dark theme: Disabled text: 30% $white
 
+$btn-focus-box-shadow: none;
+
 $bmd-btn-fab-size: 3.5rem !default; // 56px
 $bmd-btn-fab-size-sm: 2.5rem !default; // 40px
 $bmd-btn-fab-font-size: 1.5rem !default; // 24px