Fix toolbar removing