diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ea9749c5cb..388f631e1f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 - Reduced the size of the icons and clear button for compressed `EuiFormControlLayout` ([#4374](https://github.com/elastic/eui/pull/4374))
 - Added ability for text input updates in `EuiDatePicker` ([#4243](https://github.com/elastic/eui/pull/4243))
+- Fixed heights of `append` and `prepend` in `EuiFormControlLayout` ([#4410](https://github.com/elastic/eui/pull/4410))
 
 **Bug fixes**
 
diff --git a/src/components/form/form_control_layout/_form_control_layout.scss b/src/components/form/form_control_layout/_form_control_layout.scss
index 3fa99e419ab..bec98d46fdf 100644
--- a/src/components/form/form_control_layout/_form_control_layout.scss
+++ b/src/components/form/form_control_layout/_form_control_layout.scss
@@ -38,7 +38,7 @@
   .euiFormControlLayout__append {
     @include euiTextTruncate;
     flex-shrink: 0;
-    height: 100%;
+    height: auto;
     border-radius: 0;
 
     // ICONS