diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss
index 5eb2bb777191..21e72da7dda5 100644
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@ -54,9 +54,9 @@
     @include box-shadow($custom-control-indicator-active-box-shadow);
   }
 
-  // Use disabled attribute instead of :disabled pseudo-class
-  // Workaround for: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/11295231
-  &[disabled] {
+  // Use [disabled] and :disabled to work around https://github.com/twbs/bootstrap/issues/28247
+  &[disabled],
+  &:disabled {
     ~ .custom-control-label {
       color: $custom-control-label-disabled-color;
 
@@ -319,9 +319,9 @@
     box-shadow: $custom-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] ~ .custom-file-label {
+  // Use [disabled] and :disabled to work around https://github.com/twbs/bootstrap/issues/28247
+  &[disabled] ~ .custom-file-label,
+  &:disabled ~ .custom-file-label {
     background-color: $custom-file-disabled-bg;
   }
 
diff --git a/scss/_forms.scss b/scss/_forms.scss
index f91789d65628..b2edb7b27bcb 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -216,9 +216,9 @@ textarea.form-control {
   margin-top: $form-check-input-margin-y;
   margin-left: -$form-check-input-gutter;
 
-  // Use disabled attribute instead of :disabled pseudo-class
-  // Workaround for: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/11295231
-  &[disabled] ~ .form-check-label {
+  // Use [disabled] and :disabled for workaround https://github.com/twbs/bootstrap/issues/28247
+  &[disabled] ~ .form-check-label,
+  &:disabled ~ .form-check-label {
     color: $text-muted;
   }
 }