Let the user sort fields. Make sure the Editor shows up correctly.

r? @ametaireau 
yes, I was reffering to the changes I'm proposing: if we change and set the state, here we would "hide" it.