Fix for 3.5 modal

This did it for me. I don't know why you have to click twice on the button, but it does work as expected.