diff --git a/scss/_accordion.scss b/scss/_accordion.scss
index a68aaa70e..ed78ba011 100644
--- a/scss/_accordion.scss
+++ b/scss/_accordion.scss
@@ -16,10 +16,6 @@
   overflow-anchor: none;
   @include transition($accordion-transition);
 
-  &.collapsed {
-    border-bottom-width: 0;
-  }
-
   &:not(.collapsed) {
     color: $accordion-button-active-color;
     background-color: $accordion-button-active-bg;
@@ -80,6 +76,14 @@
       @include border-bottom-radius($accordion-border-radius);
     }
   }
+
+  &:not(:last-of-type) {
+    .accordion-button {
+      &.collapsed {
+        border-bottom-color: transparent;
+      }
+    }
+  }
 }
 
 .accordion-collapse {
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 31c0a1fae..9a8b95e1c 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1028,7 +1028,7 @@ $accordion-button-padding-y:              $accordion-padding-y !default;
 $accordion-button-padding-x:              $accordion-padding-x !default;
 $accordion-button-color:                  $accordion-color !default;
 $accordion-button-bg:                     $accordion-bg !default;
-$accordion-transition:                    $btn-transition, border-radius .15s ease !default;
+$accordion-transition:                    $btn-transition, border-radius .15s ease, border .35s ease !default; // border transition matches speed of transition-collapse
 $accordion-button-active-bg:              tint-color($component-active-bg, 90%) !default;
 $accordion-button-active-color:           shade-color($primary, 10%) !default;