fix(modal): Remove modal flicker, closes #1150