Fix bug with invalidate's being triggered on open from color picker