User no longer sees an 'Add Build' flicker

[Fixes #68776610]