diff --git a/scss/forms/_input-group.scss b/scss/forms/_input-group.scss
index 065f8c6117..9ae896cc44 100644
--- a/scss/forms/_input-group.scss
+++ b/scss/forms/_input-group.scss
@@ -135,7 +135,12 @@
     }
   }
 
-  > :not(:first-child):not(.dropdown-menu) {
+  $validation-messages: "";
+  @each $state in map-keys($form-validation-states) {
+    $validation-messages: $validation-messages + ":not(." + unquote($state) + "-tooltip)" + ":not(." + unquote($state) + "-feedback)";
+  }
+
+  > :not(:first-child):not(.dropdown-menu)#{$validation-messages} {
     margin-left: -$input-border-width;
     @include border-left-radius(0);
   }