diff --git a/CHANGELOG.md b/CHANGELOG.md
index c140190cbce..f49f5c02b4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 **Bug fixes**
 
 - Fixed `EuiDataGrid` cell props not resetting on column sort ([#5665](https://github.com/elastic/eui/issues/5665))
+- Fixed `EuiDataGrid` not correctly closing cell popovers when the originating cell is clicked ([#5681](https://github.com/elastic/eui/pull/5681))
 - Fixed `EuiSuggest` not correctly passing props to the search input ([#5658](https://github.com/elastic/eui/pull/5658))
 - Fixed `EuiSelectable` incorrectly rendering the passed `id` prop on the listbox instead of the parent wrapper ([#5658](https://github.com/elastic/eui/pull/5658))
 - Fixed `EuiSelectable` to no longer call `searchProps.onChange` when list items are clicked ([#5658](https://github.com/elastic/eui/pull/5658))
diff --git a/src/components/datagrid/body/data_grid_cell_popover.test.tsx b/src/components/datagrid/body/data_grid_cell_popover.test.tsx
index c519f10cab7..bbb123d58cd 100644
--- a/src/components/datagrid/body/data_grid_cell_popover.test.tsx
+++ b/src/components/datagrid/body/data_grid_cell_popover.test.tsx
@@ -101,6 +101,7 @@ describe('useCellPopover', () => {
           hasArrow={false}
           isOpen={true}
           onKeyDown={[Function]}
+          onTrapDeactivation={[Function]}
           panelClassName="euiDataGridRowCell__popover"
           panelPaddingSize="s"
           panelProps={
diff --git a/src/components/datagrid/body/data_grid_cell_popover.tsx b/src/components/datagrid/body/data_grid_cell_popover.tsx
index 73c93f46b8a..5ab67006671 100644
--- a/src/components/datagrid/body/data_grid_cell_popover.tsx
+++ b/src/components/datagrid/body/data_grid_cell_popover.tsx
@@ -73,16 +73,17 @@ export const useCellPopover = (): {
   // Note that this popover is rendered once at the top grid level, rather than one popover per cell
   const cellPopover = popoverIsOpen && popoverAnchor && (
     <EuiWrappingPopover
-      hasArrow={false}
-      button={popoverAnchor}
       isOpen={popoverIsOpen}
-      panelClassName="euiDataGridRowCell__popover"
-      panelPaddingSize="s"
+      button={popoverAnchor}
       display="block"
-      closePopover={closeCellPopover}
+      hasArrow={false}
+      panelPaddingSize="s"
+      panelClassName="euiDataGridRowCell__popover"
       panelProps={{
         'data-test-subj': 'euiDataGridExpansionPopover',
       }}
+      closePopover={closeCellPopover}
+      onTrapDeactivation={closeCellPopover}
       onKeyDown={(event) => {
         if (event.key === keys.F2 || event.key === keys.ESCAPE) {
           event.preventDefault();