From 01bd2b3151944043cfdf0e4c8ddf245f64ffe250 Mon Sep 17 00:00:00 2001
From: Joachim Schuler <jdh.schuler@gmail.com>
Date: Wed, 6 Dec 2023 12:12:01 -0500
Subject: [PATCH] Update Popover returnFocusOnDeactivate prop

Closes https://github.com/patternfly/patternfly-react/issues/9863
---
 packages/react-core/src/components/Popover/Popover.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-core/src/components/Popover/Popover.tsx b/packages/react-core/src/components/Popover/Popover.tsx
index 5a9edfecccd..3b16d0446f8 100644
--- a/packages/react-core/src/components/Popover/Popover.tsx
+++ b/packages/react-core/src/components/Popover/Popover.tsx
@@ -415,7 +415,7 @@ export const Popover: React.FunctionComponent<PopoverProps> = ({
       ref={popoverRef}
       active={focusTrapActive}
       focusTrapOptions={{
-        returnFocusOnDeactivate: true,
+        returnFocusOnDeactivate: propWithFocusTrap !== false,
         clickOutsideDeactivates: true,
         // FocusTrap's initialFocus can accept false as a value to prevent initial focus.
         // We want to prevent this in case false is ever passed in.