diff --git a/examples/grid/js/dataGrid.js b/examples/grid/js/dataGrid.js
index 0831736b22..43a324a07f 100644
--- a/examples/grid/js/dataGrid.js
+++ b/examples/grid/js/dataGrid.js
@@ -257,6 +257,8 @@ aria.Grid.prototype.checkFocusChange = function (event) {
     return;
   }
 
+  this.findFocusedItem(event.target);
+
   var key = event.which || event.keyCode;
   var rowCaret = this.focusedRow;
   var colCaret = this.focusedCol;
@@ -313,6 +315,32 @@ aria.Grid.prototype.checkFocusChange = function (event) {
   event.preventDefault();
 };
 
+/**
+ * @desc
+ *  Reset focused row and col if it doesn't match focusedRow and focusedCol
+ *
+ * @param focusedTarget
+ *  Element that is currently focused by browser
+ */
+aria.Grid.prototype.findFocusedItem = function (focusedTarget) {
+  var focusedCell = this.grid[this.focusedRow][this.focusedCol];
+
+  if (focusedCell === focusedTarget
+      || focusedCell.contains(focusedTarget)) {
+    return;
+  }
+
+  for (var i = 0; i < this.grid.length; i++) {
+    for (var j = 0; j < this.grid[i].length; j++) {
+      if (this.grid[i][j] === focusedTarget
+          || this.grid[i][j].contains(focusedTarget)) {
+        this.setFocusPointer(i, j);
+        return;
+      }
+    }
+  }
+};
+
 /**
  * @desc
  *  Triggered on click. Finds the cell that was clicked on and focuses on it.