diff --git a/effects/fadedesktop/package/contents/code/main.js b/effects/fadedesktop/package/contents/code/main.js
index ad7d064cd2..4b1cd8d0dc 100644
--- a/effects/fadedesktop/package/contents/code/main.js
+++ b/effects/fadedesktop/package/contents/code/main.js
@@ -33,6 +33,12 @@ effects['desktopChanged(int,int)'].connect(function(oldDesktop, newDesktop) {
         if (w.desktop != oldDesktop && w.desktop != newDesktop) {
             continue;
         }
+        if (w.minimized) {
+            continue;
+        }
+        if (!w.isOnActivity(currentActivity)){
+            continue;
+        }
         if (w.desktop == oldDesktop) {
             effect.animate(w, Effect.Opacity, duration, 0.0);
         } else {