Focus fixed

Tried the referred fix and moved the handlers to the field wrapper