Update to focus on buttons to try stop autofocus

Weird problem with auto focusing fields