Fix menu close firing before menu open