diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60a4fec74cd..f9e226be6d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Moved `react-view` and `html-format` to be `devDependencies` ([#3828](https://github.com/elastic/eui/pull/3828))
 - Fixed `EuiComboBox` keyboard selection when `sortMatchesBy=startsWith` ([#3823](https://github.com/elastic/eui/pull/3823))
 - Fixed `EuiCodeEditor` not exiting edit mode with `esc` when `enableLiveAutocompletion=true` ([#3833](https://github.com/elastic/eui/pull/3833))
+- Fixed issue where `EuiDataGrid`'s cell expansion popover would sometimes render as a scrollable element ([#3832](https://github.com/elastic/eui/pull/3832))
 
 ## [`27.3.0`](https://github.com/elastic/eui/tree/v27.3.0)
 
diff --git a/src-docs/src/views/datagrid/schema.js b/src-docs/src/views/datagrid/schema.js
index 44192d309a2..3a5823ef879 100644
--- a/src-docs/src/views/datagrid/schema.js
+++ b/src-docs/src/views/datagrid/schema.js
@@ -110,7 +110,7 @@ export default class DataGridSchema extends Component {
 
     this.state = {
       data,
-      sortingColumns: [{ id: 'contributions', direction: 'asc' }],
+      sortingColumns: [{ id: 'custom', direction: 'asc' }],
 
       pagination: {
         pageIndex: 0,
diff --git a/src/components/datagrid/data_grid_cell.tsx b/src/components/datagrid/data_grid_cell.tsx
index a764e6975c3..1b77a973664 100644
--- a/src/components/datagrid/data_grid_cell.tsx
+++ b/src/components/datagrid/data_grid_cell.tsx
@@ -485,6 +485,7 @@ export class EuiDataGridCell extends Component<
       innerContent = (
         <div className="euiDataGridRowCell__content">
           <EuiPopover
+            hasArrow={false}
             anchorClassName="euiDataGridRowCell__expand"
             button={anchorContent}
             isOpen={this.state.popoverIsOpen}