Menu close behaviour improvements