Fix 2 for the active top bar button issue.