I think this is unrelated to your change, but noticed it while testing and might be easy to fix at the same time - cancelling the color picker dialog still ends up changing the primary color

Thanks @cameronwhite for pointing out this bug. I tried to solve it and thought it would be easy, but as you can see from the reversal of the second commit (where, for some reason, one can't even change the colors), it's a bit tricky. I think it might deserve its own pull request, unless you have some idea of what it could be.

Agreed, this does seem more involved than I thought, since the color picker can update the palette live while it's open (you can leave it open while doing other changes on the canvas). So I think this is better as a separate issue to fix