diff --git a/src/components/fields/Date/EditorCell.tsx b/src/components/fields/Date/EditorCell.tsx
index 2b9523ed..56de95c1 100644
--- a/src/components/fields/Date/EditorCell.tsx
+++ b/src/components/fields/Date/EditorCell.tsx
@@ -63,11 +63,7 @@ export default function Date_({
             },
             "& .MuiInputAdornment-root": { m: 0 },
           }}
-          // Prevent react-data-grid showing NullEditor, which unmounts this field
-          onDoubleClick={(e) => e.stopPropagation()}
-          onKeyDown={(e) => e.stopPropagation()}
-          // Touch mode: make the whole field clickable
-          onClick={props.inputProps?.onClick as any}
+          onClick={(e) => e.stopPropagation()}
           inputProps={{ ...props.inputProps, tabIndex }}
         />
       )}
@@ -86,6 +82,7 @@ export default function Date_({
       components={{ OpenPickerIcon: ChevronDown }}
       disableOpenPicker={false}
       disabled={disabled}
+      PopperProps={{ onClick: (e) => e.stopPropagation() }}
     />
   );
 }
diff --git a/src/components/fields/Date/index.tsx b/src/components/fields/Date/index.tsx
index fdc634d0..1ff9b01a 100644
--- a/src/components/fields/Date/index.tsx
+++ b/src/components/fields/Date/index.tsx
@@ -28,7 +28,7 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <DateIcon />,
   description: `Formatted date. Format is configurable, default: ${DATE_FORMAT}. Edited with a visual picker.`,
-  TableCell: withTableCell(DisplayCell, EditorCell, "inline", {
+  TableCell: withTableCell(DisplayCell, EditorCell, "focus", {
     disablePadding: true,
   }),
   SideDrawerField,
diff --git a/src/components/fields/DateTime/EditorCell.tsx b/src/components/fields/DateTime/EditorCell.tsx
index acf8ca69..5a8cf2f1 100644
--- a/src/components/fields/DateTime/EditorCell.tsx
+++ b/src/components/fields/DateTime/EditorCell.tsx
@@ -68,11 +68,8 @@ export default function DateTime({
             },
             "& .MuiInputAdornment-root": { m: 0 },
           }}
-          // Prevent react-data-grid showing NullEditor, which unmounts this field
-          onDoubleClick={(e) => e.stopPropagation()}
           onKeyDown={(e) => e.stopPropagation()}
-          // Touch mode: make the whole field clickable
-          onClick={props.inputProps?.onClick as any}
+          onClick={(e) => e.stopPropagation()}
           inputProps={{ ...props.inputProps, tabIndex }}
         />
       )}
@@ -90,6 +87,7 @@ export default function DateTime({
       components={{ OpenPickerIcon: ChevronDown }}
       disableOpenPicker={false}
       disabled={disabled}
+      PopperProps={{ onClick: (e) => e.stopPropagation() }}
     />
   );
 }
diff --git a/src/components/fields/DateTime/index.tsx b/src/components/fields/DateTime/index.tsx
index dade54b4..cc247b97 100644
--- a/src/components/fields/DateTime/index.tsx
+++ b/src/components/fields/DateTime/index.tsx
@@ -36,7 +36,7 @@ export const config: IFieldConfig = {
   initializable: true,
   icon: <DateTimeIcon />,
   description: `Formatted date & time. Format is configurable, default: ${DATE_TIME_FORMAT}. Edited with a visual picker.`,
-  TableCell: withTableCell(DisplayCell, EditorCell, "inline", {
+  TableCell: withTableCell(DisplayCell, EditorCell, "focus", {
     disablePadding: true,
   }),
   SideDrawerField,