BR-1318 - unwanted scrollbars on modal screens