Fix focus/blur behavior
Merge pull request #582 from zeird/master

Fix focus/blur behavior