diff --git a/effects/logout.cpp b/effects/logout.cpp
index 02687ba5a9..dbb5374488 100644
--- a/effects/logout.cpp
+++ b/effects/logout.cpp
@@ -43,11 +43,11 @@ void LogoutEffect::paintWindow( EffectWindow* w, int mask, QRegion region, Windo
     effects->paintWindow( w, mask, region, data );
     }
 
-void LogoutEffect::postPaintWindow( EffectWindow* w )
+void LogoutEffect::postPaintScreen()
     {
-    if( logout_window != NULL && w != logout_window && progress != 1 )
-        w->addRepaintFull();
-    effects->postPaintWindow( w );
+    if( logout_window != NULL && progress != 1 )
+        effects->addRepaintFull();
+    effects->postPaintScreen();
     }
 
 void LogoutEffect::windowAdded( EffectWindow* w )
diff --git a/effects/logout.h b/effects/logout.h
index 96ec129daa..5ad88c41a8 100644
--- a/effects/logout.h
+++ b/effects/logout.h
@@ -23,8 +23,8 @@ class LogoutEffect
     public:
         LogoutEffect();
         virtual void prePaintScreen( ScreenPrePaintData& data, int time );
+        virtual void postPaintScreen();
         virtual void paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data );
-        virtual void postPaintWindow( EffectWindow* w );
         virtual void windowAdded( EffectWindow* w );
         virtual void windowClosed( EffectWindow* w );
     private: