Tabs: Cleaned up initial load and focus
Merge pull request #3904 from pjackson28/fixtabsfocus

Tabs: Cleaned up initial load and focus