diff --git a/src/features/cellnav/js/cellnav.js b/src/features/cellnav/js/cellnav.js
index a0038b0d23..9d0047ce1d 100644
--- a/src/features/cellnav/js/cellnav.js
+++ b/src/features/cellnav/js/cellnav.js
@@ -515,7 +515,9 @@
             var rowCol = { row: gridRow, col: gridCol };
 
             // Broadcast the navigation
-            grid.cellNav.broadcastCellNav(rowCol);
+            if (gridRow !== null && gridCol !== null) {
+              grid.cellNav.broadcastCellNav(rowCol);
+            }
           });
 
 
diff --git a/test/unit/core/row-filtering.spec.js b/test/unit/core/row-filtering.spec.js
index 4808592f29..30b47876a9 100644
--- a/test/unit/core/row-filtering.spec.js
+++ b/test/unit/core/row-filtering.spec.js
@@ -51,7 +51,7 @@ describe('rowSearcher', function() {
   });
 
   describe('guessCondition', function () {
-    iit('should create a RegExp when term ends with a *', function() {
+    it('should create a RegExp when term ends with a *', function() {
       var filter = { term: 'blah*' };
 
       var re = new RegExp(/^blah[\s\S]*?$/i);
@@ -236,7 +236,7 @@ describe('rowSearcher', function() {
       expect(ret.length).toEqual(3);
     });
   });
-  
+
   describe('with a custom filter function', function() {
     var custom, ret;
     beforeEach(function() {
@@ -250,7 +250,7 @@ describe('rowSearcher', function() {
         var orEqualTo = secondChar === '=';
         var trimBy = orEqualTo ? 2 : 1 ;
         var compareTo;
-        
+
         if (firstChar === '>') {
           compareTo = searchTerm.substr(trimBy) * 1;
           return orEqualTo ? rowValue >= compareTo : rowValue > compareTo;