diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index f964e4eb66ec1..5f2faf2ecfc6a 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -60,8 +60,8 @@
         "@visx/xychart": "^3.5.1",
         "abortcontroller-polyfill": "^1.7.5",
         "ace-builds": "^1.35.4",
-        "ag-grid-community": "31.0.3",
-        "ag-grid-react": "31.0.3",
+        "ag-grid-community": "32.2.1",
+        "ag-grid-react": "32.2.1",
         "antd": "4.10.3",
         "antd-v5": "npm:antd@^5.18.0",
         "babel-plugin-typescript-to-proptypes": "^2.0.0",
@@ -15975,17 +15975,25 @@
         "node": ">= 0.12.0"
       }
     },
+    "node_modules/ag-charts-types": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-10.2.0.tgz",
+      "integrity": "sha512-PUqH1QtugpYLnlbMdeSZVf5PpT1XZVsP69qN1JXhetLtQpVC28zaj7ikwu9CMA9N9b+dBboA9QcjUQUJZVUokQ=="
+    },
     "node_modules/ag-grid-community": {
-      "version": "31.0.3",
-      "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-31.0.3.tgz",
-      "integrity": "sha512-k81YmLaOQOab9BavYD+Pw2smZSl6TXOJqj9hRuf70XQl3EknOHCGcra7joJxZRJLMKE/HdR+u33TNyX4TCuWfg=="
+      "version": "32.2.1",
+      "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-32.2.1.tgz",
+      "integrity": "sha512-mrnm1DnLI9Wd408mMwP+6p7lbTC3FYgzNIUPygBvNh3SzZnbzTEUJF/BTKXi+MARWtG5S0IMUYy4hqBiLbobaQ==",
+      "dependencies": {
+        "ag-charts-types": "10.2.0"
+      }
     },
     "node_modules/ag-grid-react": {
-      "version": "31.0.3",
-      "resolved": "https://registry.npmjs.org/ag-grid-react/-/ag-grid-react-31.0.3.tgz",
-      "integrity": "sha512-CE4Z5Rdb0H3MFBhmge9854AyDvI4DoG7ZoUJRFB1p2pu5ANVe6tv7cwEI/ugHemEXRRP6s5uvW+ndv0Q6x1/+Q==",
+      "version": "32.2.1",
+      "resolved": "https://registry.npmjs.org/ag-grid-react/-/ag-grid-react-32.2.1.tgz",
+      "integrity": "sha512-lojTKsT/ncRZ81mrDa7qkIhZePfYlLCHIiAL1WbzL1mNPrglaa7QQKkE6hhhuAXvAm2uUhK1OfkMPnrqsEFldA==",
       "dependencies": {
-        "ag-grid-community": "~31.0.3",
+        "ag-grid-community": "32.2.1",
         "prop-types": "^15.8.1"
       },
       "peerDependencies": {
@@ -70902,17 +70910,25 @@
       "version": "1.1.2",
       "dev": true
     },
+    "ag-charts-types": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-10.2.0.tgz",
+      "integrity": "sha512-PUqH1QtugpYLnlbMdeSZVf5PpT1XZVsP69qN1JXhetLtQpVC28zaj7ikwu9CMA9N9b+dBboA9QcjUQUJZVUokQ=="
+    },
     "ag-grid-community": {
-      "version": "31.0.3",
-      "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-31.0.3.tgz",
-      "integrity": "sha512-k81YmLaOQOab9BavYD+Pw2smZSl6TXOJqj9hRuf70XQl3EknOHCGcra7joJxZRJLMKE/HdR+u33TNyX4TCuWfg=="
+      "version": "32.2.1",
+      "resolved": "https://registry.npmjs.org/ag-grid-community/-/ag-grid-community-32.2.1.tgz",
+      "integrity": "sha512-mrnm1DnLI9Wd408mMwP+6p7lbTC3FYgzNIUPygBvNh3SzZnbzTEUJF/BTKXi+MARWtG5S0IMUYy4hqBiLbobaQ==",
+      "requires": {
+        "ag-charts-types": "10.2.0"
+      }
     },
     "ag-grid-react": {
-      "version": "31.0.3",
-      "resolved": "https://registry.npmjs.org/ag-grid-react/-/ag-grid-react-31.0.3.tgz",
-      "integrity": "sha512-CE4Z5Rdb0H3MFBhmge9854AyDvI4DoG7ZoUJRFB1p2pu5ANVe6tv7cwEI/ugHemEXRRP6s5uvW+ndv0Q6x1/+Q==",
+      "version": "32.2.1",
+      "resolved": "https://registry.npmjs.org/ag-grid-react/-/ag-grid-react-32.2.1.tgz",
+      "integrity": "sha512-lojTKsT/ncRZ81mrDa7qkIhZePfYlLCHIiAL1WbzL1mNPrglaa7QQKkE6hhhuAXvAm2uUhK1OfkMPnrqsEFldA==",
       "requires": {
-        "ag-grid-community": "~31.0.3",
+        "ag-grid-community": "32.2.1",
         "prop-types": "^15.8.1"
       }
     },
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index dbcc71c767d1d..2022c1f379e5d 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -126,8 +126,8 @@
     "@visx/xychart": "^3.5.1",
     "abortcontroller-polyfill": "^1.7.5",
     "ace-builds": "^1.35.4",
-    "ag-grid-community": "31.0.3",
-    "ag-grid-react": "31.0.3",
+    "ag-grid-community": "32.2.1",
+    "ag-grid-react": "32.2.1",
     "antd": "4.10.3",
     "antd-v5": "npm:antd@^5.18.0",
     "babel-plugin-typescript-to-proptypes": "^2.0.0",
diff --git a/superset-frontend/src/components/GridTable/Header.test.tsx b/superset-frontend/src/components/GridTable/Header.test.tsx
index c1154e7476c3d..e0c31a12a0f17 100644
--- a/superset-frontend/src/components/GridTable/Header.test.tsx
+++ b/superset-frontend/src/components/GridTable/Header.test.tsx
@@ -83,14 +83,6 @@ test('synchronizes the current sort when sortChanged event occured', async () =>
   expect(sortAsc).toBeInTheDocument();
 });
 
-test('disable menu when enableMenu is false', () => {
-  const { queryByText, queryByTestId } = render(
-    <Header {...mockedProps} enableMenu={false} />,
-  );
-  expect(queryByText(mockedProps.displayName)).toBeTruthy();
-  expect(queryByTestId('mock-dropdown')).toBeFalsy();
-});
-
 test('hide display name for PIVOT_COL_ID', () => {
   const { queryByText } = render(
     <Header
diff --git a/superset-frontend/src/components/GridTable/Header.tsx b/superset-frontend/src/components/GridTable/Header.tsx
index d6a9026b56f50..b9b38da4a1daf 100644
--- a/superset-frontend/src/components/GridTable/Header.tsx
+++ b/superset-frontend/src/components/GridTable/Header.tsx
@@ -25,7 +25,7 @@ import { PIVOT_COL_ID } from './constants';
 import HeaderMenu from './HeaderMenu';
 
 interface Params {
-  enableMenu?: boolean;
+  enableFilterButton?: boolean;
   enableSorting?: boolean;
   displayName: string;
   column: Column;
@@ -82,7 +82,6 @@ const IconPlaceholder = styled.div`
 `;
 
 const Header: React.FC<Params> = ({
-  enableMenu,
   enableSorting,
   displayName,
   setSort,
@@ -174,7 +173,7 @@ const Header: React.FC<Params> = ({
           )}
         </HeaderCell>
       )}
-      {enableMenu && colId && api && (
+      {colId && api && (
         <HeaderAction
           className={`customHeaderAction${
             colId === PIVOT_COL_ID ? ' main' : ''
diff --git a/superset-frontend/src/components/GridTable/index.tsx b/superset-frontend/src/components/GridTable/index.tsx
index ef826f2c6fa62..18e8131f948aa 100644
--- a/superset-frontend/src/components/GridTable/index.tsx
+++ b/superset-frontend/src/components/GridTable/index.tsx
@@ -190,7 +190,7 @@ function GridTable<RecordType extends object>({
             -webkit-font-smoothing: antialiased;
           }
           .locked-col {
-            background: var(--ag-header-background-color);
+            background: var(--ag-row-border-color);
             padding: 0;
             text-align: center;
             font-size: calc(var(--ag-font-size) * 0.9);