Resolve #3389200 "Field selection breaks"

omkar podeyrequested to merge
issue/drupal-3389200:3389200-field-selection-breaks into main

Closes #3389200

Merge request reports