diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp
index a7b8596d4d..d5b8652684 100644
--- a/effects/presentwindows/presentwindows.cpp
+++ b/effects/presentwindows/presentwindows.cpp
@@ -272,17 +272,16 @@ void PresentWindowsEffect::windowAdded( EffectWindow *w )
 
 void PresentWindowsEffect::windowClosed( EffectWindow *w )
     {
-    if( !m_activated )
-        return;
     if( m_highlightedWindow == w )
         setHighlightedWindow( findFirstWindow() );
-    assert( m_windowData.contains( w ));
+    if( !m_windowData.contains( w ))
+        return;
     m_windowData[w].visible = false; // TODO: Fix this so they do actually fade out
     }
 
 void PresentWindowsEffect::windowDeleted( EffectWindow *w )
     {
-    if( !m_activated || !m_windowData.contains( w ))
+    if( !m_windowData.contains( w ))
         return;
     delete m_windowData[w].textFrame;
     delete m_windowData[w].iconFrame;
@@ -1148,6 +1147,8 @@ void PresentWindowsEffect::setActive( bool active, bool closingTab )
         // Add every single window to m_windowData (Just calling [w] creates it)
         foreach( EffectWindow *w, effects->stackingOrder() )
             {
+            if( m_windowData.contains( w )) // Happens if we reactivate before the ending animation finishes
+                continue;
             m_windowData[w].visible = isVisibleWindow( w );
             m_windowData[w].opacity = 0.0;
             if( w->isOnCurrentDesktop() && !w->isMinimized() )
diff --git a/effects/presentwindows/presentwindows.h b/effects/presentwindows/presentwindows.h
index f96be819cd..01ea5ded0e 100644
--- a/effects/presentwindows/presentwindows.h
+++ b/effects/presentwindows/presentwindows.h
@@ -26,8 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <QPixmap>
-
 namespace KWin
 {
 
@@ -48,7 +46,6 @@ class PresentWindowsEffect
             double highlight;
             int slot;
             int slot_distance;
-            QPixmap icon;
             EffectFrame* textFrame;
             EffectFrame* iconFrame;
             };