diff --git a/Editor.js b/Editor.js
index cddf29d1a..f36f35722 100644
--- a/Editor.js
+++ b/Editor.js
@@ -53,6 +53,7 @@ define([
 
 			if (previouslyFocusedCell && previouslyFocusedCell.row.id === row.id) {
 				this.edit(this.cell(row, previouslyFocusedCell.column.id));
+				this._previouslyFocusedEditorCell = null;
 			}
 			return rowElement;
 		},
@@ -283,6 +284,7 @@ define([
 				return null;
 			}
 
+			this._previouslyFocusedEditorCell = cell;
 			column = cell.column;
 			field = column.field;
 			cellElement = cell.element.contents || cell.element;