diff --git a/scss/_input-group.scss b/scss/_input-group.scss
index a559f15dff..a8b0e59ed4 100644
--- a/scss/_input-group.scss
+++ b/scss/_input-group.scss
@@ -21,11 +21,6 @@
     width: 1%;
     margin-bottom: 0;
 
-    // Bring the "active" form control to the top of surrounding elements
-    &:focus {
-      z-index: 3;
-    }
-
     + .form-control,
     + .custom-select,
     + .custom-file {
@@ -33,6 +28,13 @@
     }
   }
 
+  // Bring the "active" form control to the top of surrounding elements
+  > .form-control:focus,
+  > .custom-select:focus,
+  > .custom-file .custom-file-input:focus ~ .custom-file-label {
+    z-index: 3;
+  }
+
   > .form-control,
   > .custom-select {
     &:not(:last-child) { @include border-right-radius(0); }