diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 7a7ae2a3d2..56c5b9f876 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -66,7 +66,7 @@
   .btn-check:active + &,
   &:active,
   &.active,
-  .show > &.dropdown-toggle {
+  &.show {
     color: var(--#{$variable-prefix}btn-active-color);
     background-color: var(--#{$variable-prefix}btn-active-bg);
     // Remove CSS gradients if they're enabled
diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss
index 82e0c4992a..80df6669be 100644
--- a/scss/mixins/_buttons.scss
+++ b/scss/mixins/_buttons.scss
@@ -65,6 +65,6 @@
 @mixin button-size($padding-y, $padding-x, $font-size, $border-radius) {
   --#{$variable-prefix}btn-padding: #{$padding-y} #{$padding-x};
   @include rfs($font-size, --#{$variable-prefix}btn-font-size);
-  --#{$variable-prefix}btn-radius: #{$border-radius};
+  --#{$variable-prefix}btn-border-radius: #{$border-radius};
 }
 // scss-docs-end btn-size-mixin