diff --git a/app/assets/stylesheets/folio/console/bootstrap-overrides/_forms.sass b/app/assets/stylesheets/folio/console/bootstrap-overrides/_forms.sass
index e8bb1c9ca7..305c32f00d 100644
--- a/app/assets/stylesheets/folio/console/bootstrap-overrides/_forms.sass
+++ b/app/assets/stylesheets/folio/console/bootstrap-overrides/_forms.sass
@@ -92,6 +92,9 @@ legend
 .form-text
   display: block
 
+.invalid-feedback
+  word-break: break-all
+
 .invalid-feedback + .form-text,
 .form-text + .form-text
   margin-top: $form-text-margin-top / 2
diff --git a/app/components/folio/console/ui/ajax_input_component.sass b/app/components/folio/console/ui/ajax_input_component.sass
index 8f7c3758f2..a790288b0e 100644
--- a/app/components/folio/console/ui/ajax_input_component.sass
+++ b/app/components/folio/console/ui/ajax_input_component.sass
@@ -30,11 +30,13 @@
   &__inner
     position: relative
     flex: 1 1 auto
-    display: flex
-    align-items: stretch
+    display: grid
+    grid-template-columns: 1fr
+    align-items: start
 
   &__input
-    flex: 1 1 auto
+    grid-column: 1
+    grid-row: 1
     position: relative
     z-index: 1
     padding-right: px-to-rem(2 * 28px + 2 * 4px)
@@ -46,6 +48,10 @@
       &::-webkit-inner-spin-button
         -webkit-appearance: none
 
+  .invalid-feedback
+    grid-column: 1
+    grid-row: 2
+
   // Improve native multi-select usability/look
   &__input--select
     &[multiple]
@@ -61,12 +67,13 @@
         margin-left: px-to-rem(8px)
 
   &__right
-    position: absolute
+    grid-column: 1
+    grid-row: 1
     z-index: 2
-    top: 0
-    right: px-to-rem(4px)
-    height: 100%
+    justify-self: end
+    align-self: stretch
     display: flex
+    margin-right: px-to-rem(4px)
 
   &__button
     height: 100%