diff --git a/src/themes/eui-amsterdam/overrides/_form_control_layout.scss b/src/themes/eui-amsterdam/overrides/_form_control_layout.scss
index 22499c57107f..f79e12599d2d 100644
--- a/src/themes/eui-amsterdam/overrides/_form_control_layout.scss
+++ b/src/themes/eui-amsterdam/overrides/_form_control_layout.scss
@@ -1,3 +1,33 @@
 .euiFormControlLayout--group {
   border-radius: $euiBorderRadius;
+
+  .euiFormControlLayout__childrenWrapper:nth-child(2) [class*='euiField'],
+  .euiFormControlLayout__childrenWrapper:nth-child(3) [class*='euiField'] {
+    border-radius: 0;
+  }
+
+  .euiFormControlLayout__childrenWrapper:first-child [class*='euiField'] {
+    border-radius: $euiBorderRadius 0 0 $euiBorderRadius;
+  }
+
+  .euiFormControlLayout__childrenWrapper:last-child [class*='euiField'] {
+    border-radius: 0 $euiBorderRadius $euiBorderRadius 0;
+  }
+
+  &.euiFormControlLayout--compressed {
+    border-radius: $euiBorderRadiusSmall;
+
+    .euiFormControlLayout__childrenWrapper:nth-child(2) [class*='euiField'],
+    .euiFormControlLayout__childrenWrapper:nth-child(3) [class*='euiField'] {
+      border-radius: 0;
+    }
+
+    .euiFormControlLayout__childrenWrapper:first-child [class*='euiField'] {
+      border-radius: $euiBorderRadiusSmall 0 0 $euiBorderRadiusSmall;
+    }
+
+    .euiFormControlLayout__childrenWrapper:last-child [class*='euiField'] {
+      border-radius: 0 $euiBorderRadiusSmall $euiBorderRadiusSmall 0;
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/themes/eui-amsterdam/overrides/_form_control_layout_delimited.scss b/src/themes/eui-amsterdam/overrides/_form_control_layout_delimited.scss
index e8071e7b5c05..4e0f04e764bc 100644
--- a/src/themes/eui-amsterdam/overrides/_form_control_layout_delimited.scss
+++ b/src/themes/eui-amsterdam/overrides/_form_control_layout_delimited.scss
@@ -1,8 +1,41 @@
 .euiFormControlLayoutDelimited {
   border-radius: $euiBorderRadius;
 
-  .euiFormControlLayout__childrenWrapper {
+  &.euiFormControlLayout--group {
+    .euiFormControlLayout__childrenWrapper:first-child {
+      border-radius: $euiBorderRadius 0 0 $euiBorderRadius;
+    }
+  }
+
+  .euiFormControlLayout__childrenWrapper:only-child {
     border-radius: $euiBorderRadius;
     overflow: hidden;
   }
+
+  .euiFormControlLayout__prepend +
+  .euiFormControlLayout__childrenWrapper {
+    &:last-child {
+      border-radius: 0 $euiBorderRadius $euiBorderRadius 0;
+    }
+  }
+
+  &.euiFormControlLayout--compressed {
+    &.euiFormControlLayout--group {
+      .euiFormControlLayout__childrenWrapper:first-child {
+        border-radius: $euiBorderRadiusSmall 0 0 $euiBorderRadiusSmall;
+      }
+    }
+
+    .euiFormControlLayout__childrenWrapper:only-child {
+      border-radius: $euiBorderRadiusSmall;
+      overflow: hidden;
+    }
+
+    .euiFormControlLayout__prepend +
+    .euiFormControlLayout__childrenWrapper {
+      &:last-child {
+        border-radius: 0 $euiBorderRadiusSmall $euiBorderRadiusSmall 0;
+      }
+    }
+  }
 }
\ No newline at end of file