Fix component add/change and delete dialogs

I understand, and thanks for fixing, but if it isn't relevant to this PR (fixing the component add, change, and delete dialogues), I'm not sure why we are fixing it in this specific PR.

To keep things simple, I'm okay with us keeping this change in the PR, but in general I'd rather we created a separate PR if a change is irrelevant to the current PR.