diff --git a/composite.cpp b/composite.cpp
index abcf945891..7167edecaf 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -122,10 +122,14 @@ void Workspace::setupCompositing()
     addDamageFull();
     foreach( Client* c, clients )
         c->setupCompositing();
+    foreach( Client* c, desktops )
+        c->setupCompositing();
     foreach( Unmanaged* c, unmanaged )
         c->setupCompositing();
     foreach( Client* c, clients )
         scene->windowAdded( c );
+    foreach( Client* c, desktops )
+        scene->windowAdded( c );
     foreach( Unmanaged* c, unmanaged )
         scene->windowAdded( c );
     delete popup; // force re-creation of the Alt+F3 popup (opacity option)
@@ -139,12 +143,16 @@ void Workspace::finishCompositing()
     delete cm_selection;
     foreach( Client* c, clients )
         scene->windowClosed( c, NULL );
+    foreach( Client* c, desktops )
+        scene->windowClosed( c, NULL );
     foreach( Unmanaged* c, unmanaged )
         scene->windowClosed( c, NULL );
     foreach( Deleted* c, deleted )
         scene->windowDeleted( c );
     foreach( Client* c, clients )
         c->finishCompositing();
+    foreach( Client* c, desktops )
+        c->finishCompositing();
     foreach( Unmanaged* c, unmanaged )
         c->finishCompositing();
     foreach( Deleted* c, deleted )