diff --git a/ChangeLog b/ChangeLog
index 74778a761..ab868ed8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-18  Havoc Pennington  <hp@redhat.com>
+
+	* src/window.c (meta_window_new): select ColormapChangeMask 
+	on toplevel windows, maybe a partial fix for #101478
+
 Tue Dec 17 17:50:19 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
 
 	* src/themes/AgingGorilla/metacity-theme-1.xml: added support for
diff --git a/src/window.c b/src/window.c
index 82039e6aa..2c3e4e3b6 100644
--- a/src/window.c
+++ b/src/window.c
@@ -244,7 +244,8 @@ meta_window_new (MetaDisplay *display,
   XSelectInput (display->xdisplay, xwindow,
                 PropertyChangeMask |
                 EnterWindowMask | LeaveWindowMask |
-                FocusChangeMask);  
+                FocusChangeMask |
+                ColormapChangeMask);
 
   /* Get rid of any borders */
   if (attrs.border_width != 0)