Resolve focus bug (refs #3689)
Merge pull request #734 from thingthing/3.2-I3689

Resolve focus bug (refs #3689)