diff --git a/ChangeLog b/ChangeLog
index bcd715447..2b85fe447 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-13  Havoc Pennington  <hp@pobox.com>
+
+	* src/ui.c (get_cmap): fix a multihead safety thing (use proper
+	system colormap for the drawable's screen)
+
 Thu Nov 14 17:30:10 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* src/Makefile.am (libmetacityinclude_HEADERS): include common.h.
diff --git a/src/ui.c b/src/ui.c
index 5074d6b0f..13542e99e 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -410,7 +410,11 @@ get_cmap (GdkPixmap *pixmap)
       else
         {
           meta_verbose ("Using system cmap to snapshot pixmap\n");
+#ifdef HAVE_GTK_MULTIHEAD
+          cmap = gdk_screen_get_system_colormap (gdk_drawable_get_screen (pixmap));
+#else
           cmap = gdk_colormap_get_system ();
+#endif
           g_object_ref (G_OBJECT (cmap));
         }
     }