fix modal in menu setting cannot be closed by pressing ESC; also 15407 focus should be fixes