diff --git a/effects/highlightwindow/highlightwindow.cpp b/effects/highlightwindow/highlightwindow.cpp
index a7d9b6d1f0..b41741ed42 100644
--- a/effects/highlightwindow/highlightwindow.cpp
+++ b/effects/highlightwindow/highlightwindow.cpp
@@ -245,6 +245,7 @@ void HighlightWindowEffect::prepareHighlighting()
     foreach( EffectWindow *w, effects->stackingOrder() )
         if( !m_windowOpacity.contains( w )) // Just in case we are still finishing from last time
             m_windowOpacity[w] = isInitiallyHidden( w ) ? 0.0 : 1.0;
+    m_highlightedWindows.at(0)->addRepaintFull();
     }
 
 void HighlightWindowEffect::finishHighlighting()
@@ -252,6 +253,8 @@ void HighlightWindowEffect::finishHighlighting()
     m_finishing = true;
     m_monitorWindow = NULL;
     m_highlightedWindows.clear();
+    if (!m_windowOpacity.isEmpty())
+        m_windowOpacity.constBegin().key()->addRepaintFull();
     }
 
 } // namespace