diff --git a/scss/_input-group.scss b/scss/_input-group.scss
index 3b4ef632cb4a..ad09d28a89ed 100644
--- a/scss/_input-group.scss
+++ b/scss/_input-group.scss
@@ -19,6 +19,10 @@
     // proper border colors.
     position: relative;
     z-index: 2;
+    // Bring the "active" form control to the front
+    @include hover-focus-active {
+      z-index: 3;
+    }
     @if $enable-flex {
       flex: 1;
     } @else {
@@ -160,7 +164,7 @@
     }
     // Bring the "active" button to the front
     @include hover-focus-active {
-      z-index: 2;
+      z-index: 3;
     }
   }
 
@@ -176,6 +180,10 @@
     > .btn-group {
       z-index: 2;
       margin-left: -1px;
+      // Because specificity
+      @include hover-focus-active {
+        z-index: 3;
+      }
     }
   }
 }