Fix pop out design glitch