diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/HeaderCell.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/HeaderCell.tsx
index 39ae4da25e7..54164d63245 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/HeaderCell.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/HeaderCell.tsx
@@ -20,7 +20,6 @@ interface HeaderCellProps {
   justifyContent: Property.JustifyContent;
   filter: FilterType;
   setFilter: React.Dispatch<React.SetStateAction<FilterType>>;
-  filterable: boolean;
   onColumnResize?: TableColumnResizeActionCallback;
   headerCellRefs: React.MutableRefObject<Record<string, HTMLDivElement>>;
   crossFilterOrder: React.MutableRefObject<string[]>;
@@ -37,7 +36,6 @@ const HeaderCell: React.FC<HeaderCellProps> = ({
   justifyContent,
   filter,
   setFilter,
-  filterable,
   onColumnResize,
   headerCellRefs,
   crossFilterOrder,
@@ -47,6 +45,8 @@ const HeaderCell: React.FC<HeaderCellProps> = ({
   const styles = useStyles2(getStyles, justifyContent);
   const headerRef = useRef<HTMLDivElement>(null);
 
+  const filterable = field.config?.custom?.filterable ?? false;
+
   let isColumnFilterable = filterable;
   if (field.config.custom?.filterable !== filterable) {
     isColumnFilterable = field.config.custom?.filterable || false;
diff --git a/packages/grafana-ui/src/components/Table/TableNG/Cells/TableCellNG.tsx b/packages/grafana-ui/src/components/Table/TableNG/Cells/TableCellNG.tsx
index 55be6417742..dc76802de21 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/Cells/TableCellNG.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/Cells/TableCellNG.tsx
@@ -32,12 +32,13 @@ export function TableCellNG(props: TableCellNGProps) {
     shouldTextOverflow,
     setIsInspecting,
     setContextMenuProps,
-    cellInspect,
     getActions,
     rowBg,
     onCellFilterAdded,
   } = props;
 
+  const cellInspect = field.config?.custom?.inspect ?? false;
+
   const { config: fieldConfig } = field;
   const defaultCellOptions: TableAutoCellOptions = { type: TableCellDisplayMode.Auto };
   const cellOptions = fieldConfig.custom?.cellOptions ?? defaultCellOptions;
@@ -148,6 +149,7 @@ export function TableCellNG(props: TableCellNGProps) {
       tableCellDiv?.style.setProperty('z-index', String(theme.zIndex.tooltip));
       tableCellDiv?.style.setProperty('white-space', 'normal');
       tableCellDiv?.style.setProperty('min-height', `${height}px`);
+      tableCellDiv?.style.setProperty('width', `${divWidth}px`);
     }
   };
 
@@ -179,7 +181,7 @@ export function TableCellNG(props: TableCellNGProps) {
   return (
     <div ref={divWidthRef} onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave} className={styles.cell}>
       {cell}
-      {isHovered && (
+      {isHovered && (cellInspect || showFilters) && (
         <div className={styles.cellActions}>
           {cellInspect && (
             <IconButton
diff --git a/packages/grafana-ui/src/components/Table/TableNG/TableNG.test.tsx b/packages/grafana-ui/src/components/Table/TableNG/TableNG.test.tsx
index 8c2c53c1b08..4db9e07a6e4 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/TableNG.test.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/TableNG.test.tsx
@@ -1249,24 +1249,26 @@ describe('TableNG', () => {
 
   describe('Cell inspection', () => {
     it('shows inspect icon when hovering over a cell with inspection enabled', () => {
-      const fieldConfig = {
-        defaults: {
-          custom: {
-            inspect: true,
-            cellOptions: {
-              wrapText: false,
+      const inspectDataFrame = {
+        ...createBasicDataFrame(),
+        fields: createBasicDataFrame().fields.map((field) => ({
+          ...field,
+          config: {
+            ...field.config,
+            custom: {
+              ...field.config.custom,
+              inspect: true,
             },
           },
-        },
-        overrides: [],
+        })),
       };
 
       // Render the component
       const { container } = render(
         <TableNG
           enableVirtualization={false}
-          fieldConfig={fieldConfig}
-          data={createBasicDataFrame()}
+          // fieldConfig={inspectDataFrame.fields[0].config}
+          data={inspectDataFrame}
           width={800}
           height={600}
         />
diff --git a/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx b/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
index 0daa8754270..545e3375a1a 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
+++ b/packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
@@ -610,7 +610,6 @@ export function mapFrameToDataGrid({
     sortColumnsRef,
     styles,
     textWrap,
-    fieldConfig,
     theme,
     timeRange,
     getActions,
@@ -621,9 +620,6 @@ export function mapFrameToDataGrid({
   const columns: TableColumn[] = [];
   const hasNestedFrames = getIsNestedTable(frame);
 
-  const cellInspect = fieldConfig?.defaults?.custom?.inspect ?? false;
-  const filterable = fieldConfig?.defaults?.custom?.filterable ?? false;
-
   // If nested frames, add expansion control column
   if (hasNestedFrames) {
     const expanderField: Field = {
@@ -756,13 +752,12 @@ export function mapFrameToDataGrid({
                 defaultRowHeight,
                 TABLE.CELL_PADDING,
                 textWrap,
-                cellInspect,
+                field,
                 cellType
               )
             }
             setIsInspecting={setIsInspecting}
             setContextMenuProps={setContextMenuProps}
-            cellInspect={cellInspect}
             getActions={getActions}
             rowBg={rowBg}
             onCellFilterAdded={onCellFilterAdded}
@@ -803,7 +798,6 @@ export function mapFrameToDataGrid({
           justifyContent={justifyColumnContent}
           filter={filter}
           setFilter={setFilter}
-          filterable={filterable}
           onColumnResize={onColumnResize}
           headerCellRefs={headerCellRefs}
           crossFilterOrder={crossFilterOrder}
diff --git a/packages/grafana-ui/src/components/Table/TableNG/types.ts b/packages/grafana-ui/src/components/Table/TableNG/types.ts
index 2929ad220b9..e6700cc796c 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/types.ts
+++ b/packages/grafana-ui/src/components/Table/TableNG/types.ts
@@ -134,7 +134,6 @@ export interface BaseTableProps {
 export interface TableNGProps extends BaseTableProps {}
 
 export interface TableCellNGProps {
-  cellInspect: boolean;
   field: Field;
   frame: DataFrame;
   getActions?: GetActionsFunction;
diff --git a/packages/grafana-ui/src/components/Table/TableNG/utils.test.ts b/packages/grafana-ui/src/components/Table/TableNG/utils.test.ts
index 8931815514c..de74530a691 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/utils.test.ts
+++ b/packages/grafana-ui/src/components/Table/TableNG/utils.test.ts
@@ -1047,7 +1047,13 @@ describe('TableNG utils', () => {
         40, // defaultRowHeight
         8, // padding
         false, // textWrap
-        false, // cellInspect
+        {
+          config: {
+            custom: {
+              inspect: false,
+            },
+          },
+        } as Field,
         TableCellDisplayMode.Auto // cellType
       );
 
@@ -1073,7 +1079,13 @@ describe('TableNG utils', () => {
         40, // defaultRowHeight
         8, // padding
         false, // textWrap
-        false, // cellInspect
+        {
+          config: {
+            custom: {
+              inspect: false,
+            },
+          },
+        } as Field,
         TableCellDisplayMode.Auto // cellType
       );
 
@@ -1098,7 +1110,13 @@ describe('TableNG utils', () => {
         40, // defaultRowHeight
         8, // padding
         true, // textWrap ENABLED
-        false, // cellInspect
+        {
+          config: {
+            custom: {
+              inspect: true,
+            },
+          },
+        } as Field,
         TableCellDisplayMode.Auto // cellType
       );
 
@@ -1123,7 +1141,13 @@ describe('TableNG utils', () => {
         40, // defaultRowHeight
         8, // padding
         false, // textWrap
-        true, // cellInspect ENABLED
+        {
+          config: {
+            custom: {
+              inspect: true,
+            },
+          },
+        } as Field,
         TableCellDisplayMode.Auto // cellType
       );
 
diff --git a/packages/grafana-ui/src/components/Table/TableNG/utils.ts b/packages/grafana-ui/src/components/Table/TableNG/utils.ts
index addb25edb6d..602e32b6eb5 100644
--- a/packages/grafana-ui/src/components/Table/TableNG/utils.ts
+++ b/packages/grafana-ui/src/components/Table/TableNG/utils.ts
@@ -169,9 +169,11 @@ export function shouldTextOverflow(
   defaultRowHeight: number,
   padding: number,
   textWrap: boolean,
-  cellInspect: boolean,
+  field: Field,
   cellType: TableCellDisplayMode
 ): boolean {
+  const cellInspect = field.config?.custom?.inspect ?? false;
+
   // Tech debt: Technically image cells are of type string, which is misleading (kinda?)
   // so we need to ensure we don't apply overflow hover states fo type image
   if (textWrap || cellInspect || cellType === TableCellDisplayMode.Image || !isTextCell(key, columnTypes)) {