IDE Navigator and Editor toolbar driving me crazy

Been using the new IDE for two days now and I must say that I am happy with it most of the times. One thing driving me crazy though is the inconsistency in handling the Editor toolbar based on what is selected in the Navigator. The toolbar containing the Code/Layout button is shown sometimes as hidden sometimes. Just because I have selected a Control Set doesn’t mean that you need to hide the toolbar -

Please always show the toolbar! <>