Merge pull request #213 from davidmsantos90/master

[CDE-403]: Edit/Add fields doesn't change focus