diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b3b1a56e0a..af8233bfa9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 - Fixed initial focus of an `EuiButtonGroup` when first item in a popover ([#4288](https://github.com/elastic/eui/pull/4288))
 
+**Theme: Amsterdam**
+
+- Fixed styles for `EuiMarkdownEditor` ([#4289](https://github.com/elastic/eui/pull/4289))
+
 ## [`30.4.1`](https://github.com/elastic/eui/tree/v30.4.1)
 
 - Exported `useDataGridColumnSelector`, `useDataGridColumnSorting`, and `useDataGridStyleSelector` hooks ([#4271](https://github.com/elastic/eui/pull/4271))
diff --git a/src/components/markdown_editor/_index.scss b/src/components/markdown_editor/_index.scss
index dd5dfac5390..5055b564616 100644
--- a/src/components/markdown_editor/_index.scss
+++ b/src/components/markdown_editor/_index.scss
@@ -1,4 +1,3 @@
-@import 'markdown_editor';
 @import 'markdown_editor_drop_zone';
 @import 'markdown_format';
 @import 'markdown_editor_footer';
diff --git a/src/components/markdown_editor/_markdown_editor.scss b/src/components/markdown_editor/_markdown_editor.scss
deleted file mode 100644
index f88bb5d63a0..00000000000
--- a/src/components/markdown_editor/_markdown_editor.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.euiMarkdownEditor {
-  transition:
-  box-shadow $euiAnimSpeedFast ease-in;
-
-  &:focus-within {
-    @include euiSlightShadowHover;
-  }
-}
\ No newline at end of file
diff --git a/src/components/markdown_editor/_markdown_editor_drop_zone.scss b/src/components/markdown_editor/_markdown_editor_drop_zone.scss
index 8a355aaa440..e97afa555f5 100644
--- a/src/components/markdown_editor/_markdown_editor_drop_zone.scss
+++ b/src/components/markdown_editor/_markdown_editor_drop_zone.scss
@@ -1,5 +1,4 @@
 .euiMarkdownEditorDropZone {
-  @include euiFormControlDefaultShadow;
   display: flex;
   position: relative;
   flex-direction: column;
diff --git a/src/themes/eui-amsterdam/overrides/_index.scss b/src/themes/eui-amsterdam/overrides/_index.scss
index 105addb80b5..c1840ae20e9 100644
--- a/src/themes/eui-amsterdam/overrides/_index.scss
+++ b/src/themes/eui-amsterdam/overrides/_index.scss
@@ -12,6 +12,7 @@
 @import 'header';
 @import 'image';
 @import 'mark';
+@import 'markdown_editor';
 @import 'modal';
 @import 'overlay_mask';
 @import 'popover';
diff --git a/src/themes/eui-amsterdam/overrides/_markdown_editor.scss b/src/themes/eui-amsterdam/overrides/_markdown_editor.scss
new file mode 100644
index 00000000000..6ed4d1f3de6
--- /dev/null
+++ b/src/themes/eui-amsterdam/overrides/_markdown_editor.scss
@@ -0,0 +1,18 @@
+.euiMarkdownEditorToolbar {
+  border-radius: $euiFormControlBorderRadius $euiFormControlBorderRadius 0 0;
+}
+
+.euiMarkdownEditorTextArea {
+  &:focus {
+    outline: none;
+  }
+
+  &:focus:focus-visible {
+    outline-style: none;
+  }
+}
+
+.euiMarkdownEditorPreview,
+.euiMarkdownEditorFooter {
+  border-radius: 0 0 $euiFormControlBorderRadius $euiFormControlBorderRadius;
+}
\ No newline at end of file