Retrieved initial focused element to address #2533.
Merge pull request #2604 from pjackson28/master

Retrieved initial focused element to address #2533