Fix issue with selection boxes not being hidden