diff --git a/glean/schema/source/codemarkup.angle b/glean/schema/source/codemarkup.angle
index 4e199cae3..96376a006 100644
--- a/glean/schema/source/codemarkup.angle
+++ b/glean/schema/source/codemarkup.angle
@@ -905,6 +905,8 @@ predicate IndexedFile: src.File
    File where
     codemarkup.cxx.CxxDataAvailable File |
     codemarkup.EntityDataAvailable File |
+    # All Yaml files are indexable, even though they don't
+    # contain entities
     codemarkup.yaml.YamlDataAvailable File
 
 # Identifies files with indexed entities.
diff --git a/glean/schema/source/codemarkup.yaml.angle b/glean/schema/source/codemarkup.yaml.angle
index 058eaf5c9..6d2938e03 100644
--- a/glean/schema/source/codemarkup.yaml.angle
+++ b/glean/schema/source/codemarkup.yaml.angle
@@ -24,6 +24,6 @@ schema codemarkup.yaml.1 {
     yaml.XRefViaName { source = S , decl = { just = D } } = XRefs[..];
 
     predicate YamlDataAvailable : src.File
-    F where
-        src.File _ = F
+      F where yaml.XRefsByFile {file = F}
+
 }