finnp/tab-navigation-fix

Name: tab-navigation-fix