diff --git a/packages/grid/_modules_/grid/components/cell/GridEditBooleanCell.tsx b/packages/grid/_modules_/grid/components/cell/GridEditBooleanCell.tsx
index 9dd03d98c1b88..80e749d92d299 100644
--- a/packages/grid/_modules_/grid/components/cell/GridEditBooleanCell.tsx
+++ b/packages/grid/_modules_/grid/components/cell/GridEditBooleanCell.tsx
@@ -50,7 +50,7 @@ export function GridEditBooleanCell(
   return (
     <label htmlFor={id} className={clsx('MuiDataGrid-editBooleanCell', className)} {...other}>
       <Checkbox
-        autoFocus
+        autoFocus={editMode === 'cell'}
         id={id}
         checked={Boolean(valueState)}
         onChange={handleChange}
diff --git a/packages/grid/_modules_/grid/components/cell/GridEditDateCell.tsx b/packages/grid/_modules_/grid/components/cell/GridEditDateCell.tsx
index 4c30877f8b5a8..1d7b90f00f1c3 100644
--- a/packages/grid/_modules_/grid/components/cell/GridEditDateCell.tsx
+++ b/packages/grid/_modules_/grid/components/cell/GridEditDateCell.tsx
@@ -70,7 +70,7 @@ export function GridEditDateCell(props: GridEditDateCellProps & InputBaseProps)
 
   return (
     <InputBase
-      autoFocus
+      autoFocus={editMode === 'cell'}
       fullWidth
       className="MuiDataGrid-editInputCell"
       type={isDateTime ? 'datetime-local' : 'date'}
diff --git a/packages/grid/_modules_/grid/components/cell/GridEditInputCell.tsx b/packages/grid/_modules_/grid/components/cell/GridEditInputCell.tsx
index 1d5b4eb896bb8..d8d033e12e4e4 100644
--- a/packages/grid/_modules_/grid/components/cell/GridEditInputCell.tsx
+++ b/packages/grid/_modules_/grid/components/cell/GridEditInputCell.tsx
@@ -41,7 +41,7 @@ export function GridEditInputCell(props: GridEditInputCellProps & InputBaseProps
 
   return (
     <InputBase
-      autoFocus
+      autoFocus={editMode === 'cell'}
       className="MuiDataGrid-editInputCell"
       fullWidth
       type={colDef.type === 'number' ? colDef.type : 'text'}
diff --git a/packages/grid/_modules_/grid/components/cell/GridEditSingleSelectCell.tsx b/packages/grid/_modules_/grid/components/cell/GridEditSingleSelectCell.tsx
index da1ddadd4c180..5e68b464a88e9 100644
--- a/packages/grid/_modules_/grid/components/cell/GridEditSingleSelectCell.tsx
+++ b/packages/grid/_modules_/grid/components/cell/GridEditSingleSelectCell.tsx
@@ -72,7 +72,7 @@ export function GridEditSingleSelectCell(props: GridEditSingleSelectCellProps &
       MenuProps={{
         onClose: handleClose,
       }}
-      autoFocus
+      autoFocus={editMode === 'cell'}
       fullWidth
       {...other}
     >
diff --git a/packages/grid/_modules_/grid/hooks/features/focus/useGridFocus.ts b/packages/grid/_modules_/grid/hooks/features/focus/useGridFocus.ts
index 69c0ffde94e96..4f3cb9f17e61b 100644
--- a/packages/grid/_modules_/grid/hooks/features/focus/useGridFocus.ts
+++ b/packages/grid/_modules_/grid/hooks/features/focus/useGridFocus.ts
@@ -91,16 +91,9 @@ export const useGridFocus = (apiRef: GridApiRef, props: Pick<GridComponentProps,
     }));
   }, [logger, setGridState]);
 
-  const handleCellMouseUp = React.useCallback(
-    (params: GridCellParams) => {
-      const { cell } = apiRef.current.getState().focus;
-      if (!cell) {
-        return;
-      }
-      lastClickedCell.current = params;
-    },
-    [apiRef],
-  );
+  const handleCellMouseUp = React.useCallback((params: GridCellParams) => {
+    lastClickedCell.current = params;
+  }, []);
 
   const handleDocumentClick = React.useCallback(
     (event: MouseEvent) => {
diff --git a/packages/grid/_modules_/grid/hooks/features/rows/useGridEditRows.ts b/packages/grid/_modules_/grid/hooks/features/rows/useGridEditRows.ts
index cb2a574e24d42..7fdf9975c0908 100644
--- a/packages/grid/_modules_/grid/hooks/features/rows/useGridEditRows.ts
+++ b/packages/grid/_modules_/grid/hooks/features/rows/useGridEditRows.ts
@@ -43,6 +43,7 @@ import {
 import { useGridApiEventHandler, useGridApiOptionHandler } from '../../root/useGridApiEventHandler';
 import { useGridApiMethod } from '../../root/useGridApiMethod';
 import { optionsSelector } from '../../utils/optionsSelector';
+import { allGridColumnsSelector } from '../columns/gridColumnsSelector';
 import { useEventCallback } from '../../../utils/material-ui-utils';
 import { useLogger } from '../../utils/useLogger';
 import { useGridSelector } from '../core/useGridSelector';
@@ -52,6 +53,7 @@ export function useGridEditRows(apiRef: GridApiRef) {
   const logger = useLogger('useGridEditRows');
   const [, setGridState, forceUpdate] = useGridState(apiRef);
   const options = useGridSelector(apiRef, optionsSelector);
+  const columns = useGridSelector(apiRef, allGridColumnsSelector);
   const focusTimeout = React.useRef<any>(null);
   const nextFocusedCell = React.useRef<GridCellParams | null>(null);
 
@@ -285,9 +287,7 @@ export function useGridEditRows(apiRef: GridApiRef) {
 
   const handleCellEditExit = React.useCallback(
     (params: GridCellParams, event?: React.SyntheticEvent) => {
-      if (options.editMode === 'cell') {
-        setCellMode(params.id, params.field, 'view');
-      }
+      setCellMode(params.id, params.field, 'view');
 
       // When dispatched by the document, the event is not passed
       if (!event || !isKeyboardEvent(event)) {
@@ -302,7 +302,7 @@ export function useGridEditRows(apiRef: GridApiRef) {
         apiRef.current.setCellFocus(params.id, params.field);
       }
     },
-    [apiRef, options.editMode, setCellMode],
+    [apiRef, setCellMode],
   );
 
   const handleRowEditExit = React.useCallback(
@@ -363,48 +363,85 @@ export function useGridEditRows(apiRef: GridApiRef) {
     [],
   );
 
+  const startEditingRow = React.useCallback(
+    (id) => {
+      setGridState((state) => {
+        const newEditRowsState: GridEditRowsModel = { ...state.editRows };
+        if (newEditRowsState[id]) {
+          // Row is already being editted
+          return state;
+        }
+        newEditRowsState[id] = {};
+        columns.forEach((column) => {
+          newEditRowsState[id][column.field] = {
+            value: apiRef.current.getCellValue(id, column.field),
+          };
+        });
+        return { ...state, editRows: newEditRowsState };
+      });
+      forceUpdate();
+    },
+    [apiRef, columns, forceUpdate, setGridState],
+  );
+
   const handleCellKeyDown = React.useCallback(
     (params: GridCellParams, event) => {
       if (!params.isEditable || event.isPropagationStopped()) {
         return;
       }
 
-      const isEditMode = params.cellMode === 'edit';
-
+      const isInEditMode = params.cellMode === 'edit';
       const isModifierKeyPressed = event.ctrlKey || event.metaKey || event.altKey;
-      if (!isEditMode && isCellEnterEditModeKeys(event.key) && !isModifierKeyPressed) {
+
+      if (options.editMode === 'row') {
+        if (isInEditMode) {
+          if (event.key === 'Enter') {
+            apiRef.current.commitRowChange({ id: params.id });
+          } else if (event.key === 'Escape') {
+            setGridState((state) => {
+              const newEditRowsState: GridEditRowsModel = { ...state.editRows };
+              delete newEditRowsState[params.id];
+              return { ...state, editRows: newEditRowsState };
+            });
+            forceUpdate();
+          }
+        } else if (event.key === 'Enter') {
+          startEditingRow(params.id);
+        }
+        return;
+      }
+
+      if (!isInEditMode && isCellEnterEditModeKeys(event.key) && !isModifierKeyPressed) {
         apiRef.current.publishEvent(GRID_CELL_EDIT_ENTER, params, event);
       }
-      if (!isEditMode && isDeleteKeys(event.key)) {
+      if (!isInEditMode && isDeleteKeys(event.key)) {
         const commitParams = apiRef.current.getEditCellPropsParams(params.id, params.field);
         commitParams.props.value = '';
-        if (options.editMode === 'cell') {
-          apiRef.current.commitCellChange(commitParams, event);
-        }
+        apiRef.current.commitCellChange(commitParams, event);
         apiRef.current.publishEvent(GRID_CELL_EDIT_EXIT, params, event);
       }
-      if (isEditMode && isCellEditCommitKeys(event.key)) {
+      if (isInEditMode && isCellEditCommitKeys(event.key)) {
         const commitParams = apiRef.current.getEditCellPropsParams(params.id, params.field);
-        if (options.editMode === 'cell') {
-          if (!apiRef.current.commitCellChange(commitParams, event)) {
-            return;
-          }
-        } else if (!apiRef.current.commitRowChange(commitParams, event)) {
+        if (!apiRef.current.commitCellChange(commitParams, event)) {
           return;
         }
       }
-      if (isEditMode && !event.isPropagationStopped() && isCellExitEditModeKeys(event.key)) {
+      if (isInEditMode && !event.isPropagationStopped() && isCellExitEditModeKeys(event.key)) {
         apiRef.current.publishEvent(GRID_CELL_EDIT_EXIT, params, event);
       }
     },
-    [apiRef, options.editMode],
+    [apiRef, forceUpdate, options.editMode, setGridState, startEditingRow],
   );
 
   const handleDoubleClick = React.useCallback(
-    (...args) => {
-      apiRef.current.publishEvent(GRID_CELL_EDIT_ENTER, ...args);
+    (params: GridCellParams, event) => {
+      if (options.editMode === 'cell') {
+        apiRef.current.publishEvent(GRID_CELL_EDIT_ENTER, params, event);
+        return;
+      }
+      startEditingRow(params.id);
     },
-    [apiRef],
+    [apiRef, options.editMode, startEditingRow],
   );
 
   useGridApiEventHandler(apiRef, GRID_CELL_KEY_DOWN, handleCellKeyDown);
@@ -413,6 +450,7 @@ export function useGridEditRows(apiRef: GridApiRef) {
   useGridApiEventHandler(apiRef, GRID_CELL_EDIT_ENTER, handleCellEnterEdit);
   useGridApiEventHandler(apiRef, GRID_CELL_EDIT_EXIT, handleCellEditExit);
   useGridApiEventHandler(apiRef, GRID_CELL_FOCUS_OUT, handleCellFocusOut);
+  useGridApiEventHandler(apiRef, GRID_CELL_FOCUS_IN, handleCellFocusIn);
   useGridApiEventHandler(apiRef, GRID_CELL_EDIT_PROPS_CHANGE, handleCellEditPropsChange);
   useGridApiEventHandler(apiRef, GRID_COLUMN_HEADER_DRAG_START, handleColumnHeaderDragStart);
   useGridApiEventHandler(
diff --git a/packages/grid/x-grid/src/tests/editRows.XGrid.test.tsx b/packages/grid/x-grid/src/tests/editRows.XGrid.test.tsx
index b0c7c9fd223f7..f5889fa0d9f74 100644
--- a/packages/grid/x-grid/src/tests/editRows.XGrid.test.tsx
+++ b/packages/grid/x-grid/src/tests/editRows.XGrid.test.tsx
@@ -269,6 +269,7 @@ describe('<XGrid /> - Edit Rows', () => {
     expect(cell.querySelector('input')!.value).to.equal('1970');
 
     const otherCell = getCell(2, 1);
+    fireEvent.mouseUp(otherCell);
     fireEvent.click(otherCell);
     fireEvent.focus(otherCell);
     expect(cell).not.to.have.class('MuiDataGrid-cell--editing');
@@ -323,6 +324,7 @@ describe('<XGrid /> - Edit Rows', () => {
     expect(cell.querySelector('input')!.value).to.equal('1970');
 
     const otherCell = getCell(2, 1);
+    fireEvent.mouseUp(otherCell);
     fireEvent.click(otherCell);
     fireEvent.focus(otherCell);
     expect(cell).not.to.have.class('MuiDataGrid-cell--editing');
diff --git a/packages/grid/x-grid/src/tests/rows.XGrid.test.tsx b/packages/grid/x-grid/src/tests/rows.XGrid.test.tsx
index bac6ddfa81639..9fc73be6b1acb 100644
--- a/packages/grid/x-grid/src/tests/rows.XGrid.test.tsx
+++ b/packages/grid/x-grid/src/tests/rows.XGrid.test.tsx
@@ -564,6 +564,7 @@ describe('<XGrid /> - Rows', () => {
     it('should focus the clicked cell in the state', () => {
       render(<TestCase rows={baselineProps.rows} />);
 
+      fireEvent.mouseUp(getCell(0, 0));
       fireEvent.click(getCell(0, 0));
       expect(apiRef.current.getState().focus.cell).to.deep.equal({
         id: baselineProps.rows[0].id,
@@ -582,6 +583,7 @@ describe('<XGrid /> - Rows', () => {
     it('should not reset focus when removing a row not containing the focus cell', () => {
       const { setProps } = render(<TestCase rows={baselineProps.rows} />);
 
+      fireEvent.mouseUp(getCell(1, 0));
       fireEvent.click(getCell(1, 0));
       setProps({ rows: baselineProps.rows.slice(1) });
       expect(apiRef.current.getState().focus.cell).to.deep.equal({