fix flicker on text change + activate