Collapsible: Use more conservative selector to avoid recursion

(cherry picked from commit b1a3ca6177a63fcb8bd9d1e8a386ef6fd614d224)

Fixes gh-7413