Fixes for 3.5 modal

Don't know exactly why, but you have to click twice the button. Anyway,
this works "almost" flawless for the new modal form.