[FIX] Fix default field focus that was broken