Fix menu handling on leave