diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index ade1a4ed15ab..79b100cbfbd4 100644
--- a/scss/_button-group.scss
+++ b/scss/_button-group.scss
@@ -37,8 +37,8 @@
   @include border-radius($btn-border-radius);
 
   // Prevent double borders when buttons are next to each other
-  > .btn:not(:first-of-type),
-  > .btn-group:not(:first-of-type) {
+  > :not(.btn-check:first-child) + .btn,
+  > .btn-group:not(:first-child) {
     margin-left: -$btn-border-width;
   }