Make quote toggle happen atomically + add spec to test it