diff --git a/ChangeLog b/ChangeLog
index b7fa78747..c89eb7846 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-26 Mike Blumenkrantz
+
+        * fixed theme bug which prevented windows from unshading correctly when animations were disabled
+
 2013-04-25 Mike Blumenkrantz
 
         * added deskmirror
diff --git a/NEWS b/NEWS
index 0295b2519..9fede1c42 100644
--- a/NEWS
+++ b/NEWS
@@ -207,3 +207,4 @@ Fixes:
     * fixed disable of input methods in input method config dialog
     * fixed pointer warp when pointer was inside warp window but not directly over it
     * toolbar gadgets no longer crash when trying to display a popup
+    * fixed theme bug which prevented windows from unshading correctly when animations were disabled
diff --git a/data/themes/edc/border.edc b/data/themes/edc/border.edc
index fa79acb72..09b7b8496 100644
--- a/data/themes/edc/border.edc
+++ b/data/themes/edc/border.edc
@@ -625,11 +625,12 @@ group { name: "e/widgets/border/default/border";
       }
 //      program {
 //         signal: "e,state,shading"; source: "e";
-//      }
-//      program {
-//         signal: "e,state,unshaded"; source: "e";
 //      }
       program {
+         signal: "e,state,unshaded"; source: "e";
+         after: "unshading";
+      }
+      program { name: "unshading";
          signal: "e,state,unshading"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.swallow.client";