Fix toolbar selection