diff --git a/src/components/flyout/flyout.spec.tsx b/src/components/flyout/flyout.spec.tsx
index b041db9d5dc..71d293b3f4f 100644
--- a/src/components/flyout/flyout.spec.tsx
+++ b/src/components/flyout/flyout.spec.tsx
@@ -62,6 +62,19 @@ describe('EuiFlyout', () => {
         'euiFlyoutCloseButton'
       );
     });
+
+    it('does not focus trap or scrollLock for push flyouts', () => {
+      cy.mount(
+        <>
+          <div style={{ height: 2000 }}>Body scroll</div>
+          <Flyout type="push" pushMinBreakpoint="xs" size="100px" />
+        </>
+      );
+
+      cy.get('body').realClick({ position: 'topLeft' }).realPress('End'); // TODO: Use cypress-real-event's `realMouseWheel` API, whenever they release it
+      cy.wait(500); // Wait a tick to let scroll position update
+      cy.window().its('scrollY').should('not.equal', 0);
+    });
   });
 
   describe('Close behavior: standard', () => {
diff --git a/src/components/flyout/flyout.tsx b/src/components/flyout/flyout.tsx
index e5f675d5ec9..af06a2cea3d 100644
--- a/src/components/flyout/flyout.tsx
+++ b/src/components/flyout/flyout.tsx
@@ -405,7 +405,7 @@ export const EuiFlyout = forwardRef(
     let flyout = (
       <EuiFocusTrap
         disabled={isPushed}
-        scrollLock={ownFocus}
+        scrollLock={hasOverlayMask}
         clickOutsideDisables={!ownFocus}
         onClickOutside={onClickOutside}
         {...focusTrapProps}
diff --git a/src/components/focus_trap/focus_trap.spec.tsx b/src/components/focus_trap/focus_trap.spec.tsx
index 772e9ffac44..c9c3a2b5347 100644
--- a/src/components/focus_trap/focus_trap.spec.tsx
+++ b/src/components/focus_trap/focus_trap.spec.tsx
@@ -255,6 +255,19 @@ describe('EuiFocusTrap', () => {
       cy.window().its('scrollY').should('not.equal', 0);
     });
 
+    it('does not scrollLock if the focus trap is disabled', () => {
+      cy.realMount(
+        <div style={{ height: 2000 }}>
+          <EuiFocusTrap disabled={true} scrollLock={true}>
+            Test
+          </EuiFocusTrap>
+        </div>
+      );
+
+      scrollSelector('body');
+      cy.window().its('scrollY').should('not.equal', 0);
+    });
+
     it('prevents scrolling on the page body', () => {
       cy.realMount(
         <div style={{ height: 2000 }}>
diff --git a/src/components/focus_trap/focus_trap.tsx b/src/components/focus_trap/focus_trap.tsx
index c08c258802f..2d2fe5be5f4 100644
--- a/src/components/focus_trap/focus_trap.tsx
+++ b/src/components/focus_trap/focus_trap.tsx
@@ -146,7 +146,7 @@ export class EuiFocusTrap extends Component<EuiFocusTrapProps, State> {
     return (
       <FocusOn {...focusOnProps}>
         {children}
-        {scrollLock && <RemoveScrollBar gapMode={gapMode} />}
+        {!isDisabled && scrollLock && <RemoveScrollBar gapMode={gapMode} />}
       </FocusOn>
     );
   }
diff --git a/upcoming_changelogs/6764.md b/upcoming_changelogs/6764.md
new file mode 100644
index 00000000000..f85d5d5aa9b
--- /dev/null
+++ b/upcoming_changelogs/6764.md
@@ -0,0 +1,3 @@
+**Bug fixes**
+
+- Fixed broken push `EuiFlyout` behavior