Better behavior when toggling collaborate