diff --git a/projects/igniteui-angular/src/lib/grids/common/crud.service.ts b/projects/igniteui-angular/src/lib/grids/common/crud.service.ts
index 3b7664dbc8d..884a8e81ac3 100644
--- a/projects/igniteui-angular/src/lib/grids/common/crud.service.ts
+++ b/projects/igniteui-angular/src/lib/grids/common/crud.service.ts
@@ -525,21 +525,18 @@ export class IgxGridCRUDService extends IgxRowAddCrudState {
                 this.grid.tbody.nativeElement.focus();
             }
         } else {
-
-            this.createCell(cell);
             if (this.rowEditing) {
                 // TODO rowData
-                if (this.row && !this.sameRow(this.cell?.id?.rowID)) {
+                if (this.row && !this.sameRow(cell?.cellID?.rowID)) {
                     this.rowEditingBlocked = this.endEdit(true, event);
                     if (this.rowEditingBlocked) {
                         return true;
                     }
 
-                    // If enters here, @endEdit clears the new reference of the cell edit.
-                    this.createCell(cell);
                     this.rowEditingBlocked = false;
                     this.endRowEdit();
                 }
+                this.createCell(cell);
 
                 const canceled = this.beginRowEdit(event);
                 if (!canceled) {
@@ -547,6 +544,7 @@ export class IgxGridCRUDService extends IgxRowAddCrudState {
                 }
 
             } else {
+                this.createCell(cell);
                 this.beginCellEdit(event);
             }
         }
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-toolbar.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-toolbar.spec.ts
index 0a55efa6603..14f45ee8715 100644
--- a/projects/igniteui-angular/src/lib/grids/grid/grid-toolbar.spec.ts
+++ b/projects/igniteui-angular/src/lib/grids/grid/grid-toolbar.spec.ts
@@ -7,7 +7,6 @@ import { configureTestSuite } from '../../test-utils/configure-suite';
 import { GridFunctions } from "../../test-utils/grid-functions.spec";
 import { By } from "@angular/platform-browser";
 
-
 const TOOLBAR_TAG = 'igx-grid-toolbar';
 const TOOLBAR_TITLE_TAG = 'igx-grid-toolbar-title';
 const TOOLBAR_ACTIONS_TAG = 'igx-grid-toolbar-actions';