Add smarter input focussing