Fixed issue that caused focus on first field to be triggered too often