diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp
index e46a61c646..b5dd5b86a4 100644
--- a/effects/presentwindows/presentwindows.cpp
+++ b/effects/presentwindows/presentwindows.cpp
@@ -162,8 +162,13 @@ void* PresentWindowsEffect::proxy()
 
 void PresentWindowsEffect::toggleActiveClass()
 {
-    m_mode = ModeWindowClass;
-    m_class = effects->activeWindow()->windowClass();
+    if( !m_activated )
+        {
+        if( !effects->activeWindow() )
+            return;
+        m_mode = ModeWindowClass;
+        m_class = effects->activeWindow()->windowClass();
+        }
     setActive( !m_activated );
 }