diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp
index 95987d0731..062e215192 100644
--- a/effects/desktopgrid/desktopgrid.cpp
+++ b/effects/desktopgrid/desktopgrid.cpp
@@ -233,6 +233,8 @@ void DesktopGridEffect::prePaintWindow( EffectWindow* w, WindowPrePaintData& dat
         if( w->isOnDesktop( paintingDesktop ))
             {
             w->enablePainting( EffectWindow::PAINT_DISABLED_BY_DESKTOP );
+            if( w->isMinimized() && isUsingPresentWindows() )
+                w->enablePainting( EffectWindow::PAINT_DISABLED_BY_MINIMIZE );
             data.mask |= PAINT_WINDOW_TRANSFORMED;
 
             // Split windows at screen edges
@@ -324,6 +326,10 @@ void DesktopGridEffect::paintWindow( EffectWindow* w, int mask, QRegion region,
                 // fade out panels if present windows is used
                 d.opacity *= ( 1.0 - timeline.value() );
                 }
+            if( isUsingPresentWindows() && w->isMinimized() )
+                {
+                d.opacity *= timeline.value();
+                }
 
             if( effects->compositingType() == XRenderCompositing )
                 { // More exact clipping as XRender displays the entire window instead of just the quad