diff --git a/src/components/filter/explicitNaming/ExplicitNamingFilterForm.tsx b/src/components/filter/explicitNaming/ExplicitNamingFilterForm.tsx
index 47b65175..c76c2b2a 100644
--- a/src/components/filter/explicitNaming/ExplicitNamingFilterForm.tsx
+++ b/src/components/filter/explicitNaming/ExplicitNamingFilterForm.tsx
@@ -133,6 +133,7 @@ export function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversi
                 field: FieldConstants.EQUIPMENT_ID,
                 editable: true,
                 singleClickEdit: true,
+                flex: 1,
                 valueParser: (params: ValueParserParams) => params.newValue?.trim() ?? null,
             },
         ];
@@ -143,7 +144,7 @@ export function ExplicitNamingFilterForm({ sourceFilterForExplicitNamingConversi
                 editable: true,
                 singleClickEdit: true,
                 cellEditor: NumericEditor,
-                maxWidth: 200,
+                flex: 1,
             });
         }
         return newColumnDefs;
diff --git a/src/components/inputs/reactHookForm/agGridTable/CustomAgGridTable.tsx b/src/components/inputs/reactHookForm/agGridTable/CustomAgGridTable.tsx
index 306c7c23..42bbabfd 100644
--- a/src/components/inputs/reactHookForm/agGridTable/CustomAgGridTable.tsx
+++ b/src/components/inputs/reactHookForm/agGridTable/CustomAgGridTable.tsx
@@ -7,7 +7,7 @@
 
 import { useCallback, useEffect, useState } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
-import { AgGridReact, AgGridReactProps } from 'ag-grid-react';
+import { AgGridReactProps } from 'ag-grid-react';
 import 'ag-grid-community/styles/ag-grid.css';
 import 'ag-grid-community/styles/ag-theme-alpine.css';
 import { Box, useTheme } from '@mui/material';
@@ -15,6 +15,7 @@ import { useIntl } from 'react-intl';
 import { CellEditingStoppedEvent, ColumnState, SortChangedEvent } from 'ag-grid-community';
 import { BottomRightButtons } from './BottomRightButtons';
 import { FieldConstants } from '../../../../utils/constants/fieldConstants';
+import { CustomAGGrid } from '../../../customAGGrid';
 
 const style = (customProps: any) => ({
     grid: (theme: any) => ({
@@ -181,12 +182,6 @@ export function CustomAgGridTable({
         setNewRowAdded(true);
     };
 
-    useEffect(() => {
-        if (gridApi) {
-            gridApi.api.sizeColumnsToFit();
-        }
-    }, [columnDefs, gridApi]);
-
     const intl = useIntl();
     const getLocaleText = useCallback(
         (params: any) => {
@@ -229,7 +224,7 @@ export function CustomAgGridTable({
     return (
         <>
             <Box className={theme.aggrid.theme} sx={style(cssProps).grid}>
-                <AgGridReact
+                <CustomAGGrid
                     rowData={rowData}
                     onGridReady={onGridReady}
                     getLocaleText={getLocaleText}