Merge branch 'master' into sstoychev/wrong-imports

Author: ChronosSF

projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts

@@ -434,16 +434,17 @@ export class IgxGridNavigationService {
             this.grid.unpinnedColumns[this.grid.unpinnedColumns.length - 1].visibleIndex === visibleColumnIndex) {
             return;
         }
-        if (nextIsDetailRow && isLastColumn) {
-            this.navigateDown(currentRowEl, { row: rowIndex, column: visibleColumnIndex });
-            return;
-        }
 
         if (this.isRowInEditMode(rowIndex)) {
             this.moveNextEditable(rowIndex, visibleColumnIndex);
             return;
         }
 
+        if (nextIsDetailRow && isLastColumn) {
+            this.navigateDown(currentRowEl, { row: rowIndex, column: visibleColumnIndex });
+            return;
+        }
+
         if (isLastColumn) {
             const rowEl = this.grid.rowList.find(row => row.index === rowIndex + 1) ?
                 this.grid.rowList.find(row => row.index === rowIndex + 1) :