diff --git a/src/components/DatasetControl/EditColumns/EditColumns.tsx b/src/components/DatasetControl/EditColumns/EditColumns.tsx
index cedbde0e..f297531f 100644
--- a/src/components/DatasetControl/EditColumns/EditColumns.tsx
+++ b/src/components/DatasetControl/EditColumns/EditColumns.tsx
@@ -88,7 +88,8 @@ export const EditColumns = (props: IEditColumnsProps) => {
                 footer: styles.panelFooter,
                 commands: styles.panelCommands,
                 scrollableContent: styles.panelScrollableContent,
-                content: styles.panelContent
+                content: styles.panelContent,
+                headerText: styles.headerText
             }}
             isFooterAtBottom
             onRenderFooterContent={() => {
diff --git a/src/components/DatasetControl/EditColumns/styles.ts b/src/components/DatasetControl/EditColumns/styles.ts
index a0a52cfc..348b25b3 100644
--- a/src/components/DatasetControl/EditColumns/styles.ts
+++ b/src/components/DatasetControl/EditColumns/styles.ts
@@ -45,6 +45,9 @@ export const getEditColumnsStyles = (theme: ITheme) => {
             flexDirection: 'column',
             gap: 12
         },
+        headerText: {
+            whiteSpace: 'normal'
+        },
         selectors: {
             display: 'flex',
             flexDirection: 'column',
diff --git a/src/components/Grid/grid/ag-grid/AgGridModel.ts b/src/components/Grid/grid/ag-grid/AgGridModel.ts
index 522d7cd9..27981d58 100644
--- a/src/components/Grid/grid/ag-grid/AgGridModel.ts
+++ b/src/components/Grid/grid/ag-grid/AgGridModel.ts
@@ -291,6 +291,8 @@ export class AgGridModel extends EventEmitter<IAgGridModelEvents> {
             case this._grid.isColumnEditable(column.name, e.data):
             //do not navigate on aggregated/grouped rows
             case e.data?.getSummarizationType() !== 'none':
+            //do not allow double click navigation for editable grids (it creates confusion between double clicking read only columns to navigate and double clicking editable columns to edit)
+            case this._grid.isEditingEnabled():
             //do not navigate on checkbox column
             case column.name === DataProvider.CONST.CHECKBOX_COLUMN_KEY: {
                 break;