Tabs: Fixed tab selection when switching from mobile to desktop view

Fixes #6285
Merge pull request #6291 from pjackson28/fixtabsviewswitch

Tabs: Fixed tab selection when switching from mobile to desktop view