diff --git a/ChangeLog b/ChangeLog
index 8b22adf7c..532975a1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-10  Josh Lee  <jleedev@gmail.com>
+
+        * src/core/compositor.c (window_has_shadow): Don't shadow
+	shaped windows.
+
 2008-03-07  Thomas Thurman  <tthurman@gnome.org>
 
         * configure.in: Post-release bump to 2.23.3.
diff --git a/src/core/compositor.c b/src/core/compositor.c
index 1612cf5f7..7667147a8 100644
--- a/src/core/compositor.c
+++ b/src/core/compositor.c
@@ -777,6 +777,12 @@ window_has_shadow (MetaCompWindow *cw)
   if (((MetaCompScreen *)cw->screen->compositor_data)->have_shadows == FALSE) 
     return FALSE;
 
+  /* Never put a shadow around shaped windows */
+  if (cw->shaped) {
+    meta_verbose ("Window has no shadow as it is shaped\n");
+    return FALSE;
+  }
+
   /* Always put a shadow around windows with a frame */
   if (cw->window) 
     {