diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 4b61ca3ed..c1aa7aeb2 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -9,7 +9,7 @@ http://www.newbreedsoftware.com/tuxpaint/
 $Id$
 
 
-2006.February.5 (0.9.16)
+2006.February.12 (0.9.16)
   * Interface improvements:
     -----------------------
     * Modified "Text" tool so that it correctly handles the 16-bit unicode
@@ -59,6 +59,9 @@ $Id$
       PNGs where RGB colors were stored, even where pixels were
       fully transparent.)
 
+    * Clicking between the rightmost color and the edge of Tux Paint's display
+      would crash Tux Paint.  (Fixes DBTS #352556)
+
 
 2005.November.26 (0.9.15b)
 
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index dbffa3986..ae7dc4dfc 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 - January 14, 2006
+  June 14, 2002 - February 12, 2006
   $Id$
 */
 
@@ -3893,7 +3893,7 @@ static void mainloop(void)
 		  /* Color! */
 		  which = GRIDHIT_GD(r_colors,gd_colors);
 		  
-		  if (which < NUM_COLORS)
+		  if (which > 0 && which < NUM_COLORS)
 		    {
 		      cur_color = which;
 		      playsound(1, SND_BUBBLE, 1);