Fix for broad scale selection removing buttons etc