Works better.

Doesn't lose focus when editing the field.