diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 0868697e4..00ec9e729 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -133,6 +133,10 @@ https://tuxpaint.org/
     * Don't try to load a blank-named template during slideshow playback.
       Bill Kendrick <bill@newbreedsoftware.com>
 
+    * Color palette would still show previously-selected color as active
+      when returning from the temporary color pipette ([Ctrl] + click).
+      Bill Kendrick <bill@newbreedsoftware.com>
+
   * Ports & Building:
     -----------------
     * Created "src/indent.sh", to run 'indent' against source files.
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index c64165599..9d9d858d0 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -22,7 +22,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
 
-  June 14, 2002 - May 1, 2023
+  June 14, 2002 - May 3, 2023
 */
 
 #include "platform.h"
@@ -5203,7 +5203,6 @@ static void mainloop(void)
             chose_color = do_color_sel(1);
 
             draw_cur_tool_tip();
-            draw_colors(COLORSEL_FORCE_REDRAW);
 
             if (chose_color)
             {
@@ -5214,6 +5213,8 @@ static void mainloop(void)
             else
               playsound(screen, 1, SND_CLICK, 1, SNDPOS_CENTER, SNDDIST_NEAR);
 
+            draw_colors(COLORSEL_FORCE_REDRAW);
+
             SDL_Flip(screen);
           }
           else if (kbd_state[SDL_SCANCODE_X])