fix(popup): Ensure popup is usable on top of a modal, closes #838