1829 user experience redesign modal fix

For Garren's Modal Overlay issue (#9 in his doc, where the modal was behind the click blocker). 

I did a quick smoke test and this didn't appear to mess with anything.