diff --git a/src/TestStack.White/Factory/TableCellFactory.cs b/src/TestStack.White/Factory/TableCellFactory.cs
index 67df882d..371997ae 100644
--- a/src/TestStack.White/Factory/TableCellFactory.cs
+++ b/src/TestStack.White/Factory/TableCellFactory.cs
@@ -31,6 +31,8 @@ public virtual TableCells CreateCells(TableHeader tableHeader, AutomationElement
                 return name.EndsWith(rowNameSuffix);
             };
             List<AutomationElement> tableCellElements = customControlTypes.FindAll(cellPredicate);
+            if (tableCellElements.Count > 0) return new TableCells(tableCellElements, tableHeader, actionListener);
+            tableCellElements = new AutomationElementFinder(rowElement).Descendants(AutomationSearchCondition.ByControlType(ControlType.DataItem));
             return new TableCells(tableCellElements, tableHeader, actionListener);
         }
     }