diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index e3f8061e9ac8..a1e0849df01a 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -123,5 +123,12 @@
       margin-left: .5em;
     }
   }
+
+  .input-group .form-control,
+  .input-group .form-select {
+    @include form-validation-state-selector($state) {
+      z-index: 3;
+    }
+  }
 }
 // scss-docs-end form-validation-mixins