diff --git a/CHANGELOG.md b/CHANGELOG.md
index a75157c7..956e62b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Unreleased
+
+### Bug Fixes
+
+- Fix an issue where focused buttons appear with a double focus ring style.
+
 ## 4.0.0
 
 ### Breaking Changes
diff --git a/src/scss/components/_buttons.scss b/src/scss/components/_buttons.scss
index 300b1645..68c0c69e 100644
--- a/src/scss/components/_buttons.scss
+++ b/src/scss/components/_buttons.scss
@@ -17,8 +17,8 @@
     color: color('white');
   }
 
-  &:focus,
-  &.usa--focus {
+  &:not([disabled]):focus,
+  &:not([disabled]).usa-focus {
     outline-offset: units(0.5);
   }
 
@@ -27,8 +27,8 @@
   }
 }
 
-.usa-button:focus,
-.usa-button.usa-focus {
+.usa-button:not([disabled]):focus,
+.usa-button:not([disabled]).usa-focus {
   @include disable-default-focus-styles;
   box-shadow: roundable-focus-outline-box-shadows();
 }
@@ -43,8 +43,8 @@
     color: color('primary');
   }
 
-  &:focus,
-  &.usa-focus {
+  &:not([disabled]):focus,
+  &:not([disabled]).usa-focus {
     box-shadow: $button-stroke color('primary'), roundable-focus-outline-box-shadows();
   }
 
@@ -224,4 +224,4 @@
     color: color('primary');
     text-decoration: none;
   }
-}
\ No newline at end of file
+}