Richard,
Why don't you try using the context menu? Just right click on an object that has the material you wish to edit. Then select "edit material". That material will be the one selected in editor.
The current system isn't perfect but it works. I will definitely implement the new system for the next release because it is SO much better. (For some reason, I thought it would be more confusing but I was wrong....)