Fix loading tab regression #8631

Merged
merged 2 commits into from May 8, 2017