Fixed context-switcher on staff apps