fix focus problem v2
Merge pull request #369 from gergo85/patch-12

fix focus problem