Should fix the colorpicker quirkyness