fix topbar .active bg (#4232)
Merge branch 'topbar-active-fix'