diff --git a/src/plugins/discover/public/application/components/chart/chart.tsx b/src/plugins/discover/public/application/components/chart/chart.tsx
index d26f1508c226..92e7b12dc0a0 100644
--- a/src/plugins/discover/public/application/components/chart/chart.tsx
+++ b/src/plugins/discover/public/application/components/chart/chart.tsx
@@ -118,7 +118,6 @@ export const DiscoverChart = ({
       <EuiFlexItem grow={true} style={{ justifyContent: 'flex-start' }}>
         {isTimeBased && timeChartHeader}
       </EuiFlexItem>
-      <EuiFlexItem grow={false}>{discoverOptions}</EuiFlexItem>
     </EuiFlexGroup>
   );
 
diff --git a/src/plugins/discover/public/application/components/data_grid/data_grid_table.tsx b/src/plugins/discover/public/application/components/data_grid/data_grid_table.tsx
index a999e1c50379..cd92fb461156 100644
--- a/src/plugins/discover/public/application/components/data_grid/data_grid_table.tsx
+++ b/src/plugins/discover/public/application/components/data_grid/data_grid_table.tsx
@@ -6,6 +6,7 @@
 import { i18n } from '@osd/i18n';
 import React, { useState } from 'react';
 import { EuiPanel } from '@elastic/eui';
+import { QUERY_ENHANCEMENT_ENABLED_SETTING } from '../../../../common';
 import { IndexPattern, getServices } from '../../../opensearch_dashboards_services';
 import { DataGridFlyout } from './data_grid_table_flyout';
 import { DiscoverGridContextProvider } from './data_grid_table_context';
@@ -71,35 +72,37 @@ export const DataGridTable = ({
   }
 
   const newDiscoverEnabled = getNewDiscoverSetting(services.storage);
+  const isQueryEnhancementEnabled = services.uiSettings.get(QUERY_ENHANCEMENT_ENABLED_SETTING);
 
-  const panelContent = newDiscoverEnabled ? (
-    <DataGrid
-      columns={columns}
-      indexPattern={indexPattern}
-      sort={sort}
-      onSort={onSort}
-      rows={rows}
-      onSetColumns={onSetColumns}
-      isToolbarVisible={isToolbarVisible}
-      isContextView={isContextView}
-    />
-  ) : (
-    <DefaultDiscoverTable
-      columns={adjustedColumns}
-      indexPattern={indexPattern}
-      sort={sort}
-      onSort={onSort}
-      rows={rows}
-      hits={hits}
-      onAddColumn={onAddColumn}
-      onMoveColumn={onMoveColumn}
-      onRemoveColumn={onRemoveColumn}
-      onFilter={onFilter}
-      onClose={() => setInspectedHit(undefined)}
-      showPagination={showPagination}
-      scrollToTop={scrollToTop}
-    />
-  );
+  const panelContent =
+    isQueryEnhancementEnabled || !newDiscoverEnabled ? (
+      <DefaultDiscoverTable
+        columns={adjustedColumns}
+        indexPattern={indexPattern}
+        sort={sort}
+        onSort={onSort}
+        rows={rows}
+        hits={hits}
+        onAddColumn={onAddColumn}
+        onMoveColumn={onMoveColumn}
+        onRemoveColumn={onRemoveColumn}
+        onFilter={onFilter}
+        onClose={() => setInspectedHit(undefined)}
+        showPagination={showPagination}
+        scrollToTop={scrollToTop}
+      />
+    ) : (
+      <DataGrid
+        columns={columns}
+        indexPattern={indexPattern}
+        sort={sort}
+        onSort={onSort}
+        rows={rows}
+        onSetColumns={onSetColumns}
+        isToolbarVisible={isToolbarVisible}
+        isContextView={isContextView}
+      />
+    );
 
   const tablePanelProps = {
     paddingSize: 'none' as const,