fix: Avoid shelf flicker