diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ae92a3df24..a81f013543d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - Fixed `EuiSkipLink` interactive props and Safari click issue ([#3665](https://github.com/elastic/eui/pull/3665))
 - Fixed `z-index` issues with `EuiHeader`, `EuiFlyout`, and other portal content ([#3655](https://github.com/elastic/eui/pull/3655))
 - Fixed `color` prop error in `EuiBadge` to be more flexible with what format it accepts ([#3655](https://github.com/elastic/eui/pull/3655))
+- Fixed `EuiSuperSelect` popover from moving 16px horizontally when it's close to a window edge ([#3685](https://github.com/elastic/eui/pull/3685))
 
 **Theme: Amsterdam**
 
diff --git a/src/components/color_picker/color_palette_picker/__snapshots__/color_palette_picker.test.tsx.snap b/src/components/color_picker/color_palette_picker/__snapshots__/color_palette_picker.test.tsx.snap
index b0d49cd535d..efb9a26ad61 100644
--- a/src/components/color_picker/color_palette_picker/__snapshots__/color_palette_picker.test.tsx.snap
+++ b/src/components/color_picker/color_palette_picker/__snapshots__/color_palette_picker.test.tsx.snap
@@ -591,6 +591,7 @@ exports[`EuiColorPalettePicker more props are propagated to each option 2`] = `
   >
     <EuiPopover
       anchorPosition="downCenter"
+      buffer={0}
       button={
         <EuiSuperSelectControl
           className="euiSuperSelect--isOpen__button"
diff --git a/src/components/form/super_select/__snapshots__/super_select.test.tsx.snap b/src/components/form/super_select/__snapshots__/super_select.test.tsx.snap
index aad1334a362..f0958f150b8 100644
--- a/src/components/form/super_select/__snapshots__/super_select.test.tsx.snap
+++ b/src/components/form/super_select/__snapshots__/super_select.test.tsx.snap
@@ -530,6 +530,7 @@ exports[`EuiSuperSelect props more props are propogated to each option 2`] = `
 >
   <EuiPopover
     anchorPosition="downCenter"
+    buffer={0}
     button={
       <EuiSuperSelectControl
         className="euiSuperSelect--isOpen__button"
diff --git a/src/components/form/super_select/super_select.tsx b/src/components/form/super_select/super_select.tsx
index 4e177aa3e6a..0a5771377ca 100644
--- a/src/components/form/super_select/super_select.tsx
+++ b/src/components/form/super_select/super_select.tsx
@@ -339,7 +339,8 @@ export class EuiSuperSelect<T extends string> extends Component<
         anchorPosition="downCenter"
         ownFocus={false}
         popoverRef={this.setPopoverRef}
-        hasArrow={false}>
+        hasArrow={false}
+        buffer={0}>
         <EuiScreenReaderOnly>
           <p role="alert">
             <EuiI18n