Fix menu sometimes clearing before screen wipe