Fixed edit field focus bug