diff --git a/scss/forms/_form-check.scss b/scss/forms/_form-check.scss
index c4837f83b6..7fd5259685 100644
--- a/scss/forms/_form-check.scss
+++ b/scss/forms/_form-check.scss
@@ -82,13 +82,16 @@
     border-color: $form-check-input-indeterminate-border-color;
   }
 
-  // Use disabled attribute instead of :disabled pseudo-class
-  // Workaround for: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/11295231
-  &[disabled] {
+  &:disabled {
     pointer-events: none;
     filter: none;
     opacity: .5;
+  }
 
+  // Use disabled attribute in addition of :disabled pseudo-class
+  // See: https://github.com/twbs/bootstrap/issues/28247
+  &[disabled],
+  &:disabled {
     ~ .form-check-label {
       opacity: .5;
     }
diff --git a/scss/forms/_form-file.scss b/scss/forms/_form-file.scss
index 3748f495cf..39d3448af2 100644
--- a/scss/forms/_form-file.scss
+++ b/scss/forms/_form-file.scss
@@ -26,9 +26,10 @@
     box-shadow: $form-file-focus-box-shadow;
   }
 
-  // Use disabled attribute instead of :disabled pseudo-class
-  // Workaround for: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/11295231
-  &[disabled] ~ .form-file-label .form-file-text {
+  // Use disabled attribute in addition of :disabled pseudo-class
+  // See: https://github.com/twbs/bootstrap/issues/28247
+  &[disabled] ~ .form-file-label .form-file-text,
+  &:disabled ~ .form-file-label .form-file-text {
     background-color: $form-file-disabled-bg;
     border-color: $form-file-disabled-border-color;
   }