Fixed menu state change issue