diff --git a/accessible/base/Filters.cpp b/accessible/base/Filters.cpp
index 3bf36f143cf6..619a68774e71 100644
--- a/accessible/base/Filters.cpp
+++ b/accessible/base/Filters.cpp
@@ -47,10 +47,7 @@ filters::GetRow(Accessible* aAccessible)
 uint32_t
 filters::GetCell(Accessible* aAccessible)
 {
-  a11y::role role = aAccessible->Role();
-  return role == roles::CELL || role == roles::GRID_CELL ||
-         role == roles::ROWHEADER || role == roles::COLUMNHEADER ?
-    eMatch : eSkipSubtree;
+  return aAccessible->IsTableCell() ? eMatch : eSkipSubtree;
 }
 
 uint32_t