diff --git a/accessible/base/EmbeddedObjCollector.cpp b/accessible/base/EmbeddedObjCollector.cpp
index af2445ff250f..226d1365f6c0 100644
--- a/accessible/base/EmbeddedObjCollector.cpp
+++ b/accessible/base/EmbeddedObjCollector.cpp
@@ -31,7 +31,7 @@ EmbeddedObjCollector::EnsureNGetObject(uint32_t aIndex)
   uint32_t childCount = mRoot->ChildCount();
   while (mRootChildIdx < childCount) {
     Accessible* child = mRoot->GetChildAt(mRootChildIdx++);
-    if (!(filters::GetEmbeddedObject(child) & filters::eMatch))
+    if (child->IsText())
       continue;
 
     AppendObject(child);
@@ -48,7 +48,7 @@ EmbeddedObjCollector::EnsureNGetIndex(Accessible* aAccessible)
   uint32_t childCount = mRoot->ChildCount();
   while (mRootChildIdx < childCount) {
     Accessible* child = mRoot->GetChildAt(mRootChildIdx++);
-    if (!(filters::GetEmbeddedObject(child) & filters::eMatch))
+    if (child->IsText())
       continue;
 
     AppendObject(child);
@@ -69,8 +69,7 @@ EmbeddedObjCollector::GetIndexAt(Accessible* aAccessible)
   if (aAccessible->mInt.mIndexOfEmbeddedChild != -1)
     return aAccessible->mInt.mIndexOfEmbeddedChild;
 
-  return filters::GetEmbeddedObject(aAccessible) & filters::eMatch ?
-    EnsureNGetIndex(aAccessible) : -1;
+  return !aAccessible->IsText() ?  EnsureNGetIndex(aAccessible) : -1;
 }
 
 void