diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 138185ec..56fe65ca 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -49,6 +49,13 @@
       @include box-shadow($bmd-shadow-focus);
       //border: 1px solid $green;
     }
+
+    // :focus - Avoid outline/boxShadow on buttons after mouseup
+    &.focus,
+    &:focus {
+      box-shadow: none; // disable box-shadow
+      outline: 0; // disable outline
+    }
   }
 
   //---