Fix UI behavior for hiding of the add button

Reviewer: Tiff Go

Issue: none