fix modal in menu setting cannot be closed by pressing ESC; also 15407 focus should be fixes
Merge pull request #1877 from 0xF013/feature/15406-modal-in-menu-settings-cannot-be-closed-by-pressing-esc

fix modal in menu setting cannot be closed by pressing ESC