[WIP] fix modal in menu setting cannot be closed by pressing ESC; also 15407 f...

...ocus should be fixes

Test to see if problems have been fixed by adding the scrolling