Attempt to fix JIRA 1715 - Smart tabs