diff --git a/scss/forms/_form-check.scss b/scss/forms/_form-check.scss
index 7dd9a06238..c62cf3a13d 100644
--- a/scss/forms/_form-check.scss
+++ b/scss/forms/_form-check.scss
@@ -262,14 +262,6 @@
       height: 100%;
       content: "";
     }
-
-    &:not(:first-of-type) {
-      border-left: 0;
-    }
-
-    &:not(:last-of-type) {
-      border-right: 0;
-    }
   }
 
   &:hover + .btn,
@@ -386,4 +378,18 @@
   // End mod
 }
 
+.btn-group {
+  .btn-check {
+    + .btn {
+      &:not(:first-of-type) {
+        border-left: 0;
+      }
+
+      &:not(:last-of-type) {
+        border-right: 0;
+      }
+    }
+  }
+}
+
 // Boosted mod: no `@if enable-dark-mode` since Boosted doesn't have any dark mode for now