diff --git a/composite.cpp b/composite.cpp
index fe76957196..b309bd9d38 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -182,12 +182,6 @@ void Workspace::setupCompositing()
     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);
     discardPopup(); // force re-creation of the Alt+F3 popup (opacity option)
 #else
     kDebug(1212) << "Compositing was not available at compile time";
@@ -541,6 +535,7 @@ void Toplevel::setupCompositing()
     effect_window->setWindow(this);
     unredirect = false;
     workspace()->checkUnredirect(true);
+    scene->windowAdded(this);
 #endif
 }
 
diff --git a/workspace.cpp b/workspace.cpp
index 98b41f9303..b9556681b2 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -565,9 +565,6 @@ Client* Workspace::createClient(Window w, bool is_mapped)
     tilingLayouts.resize(numberOfDesktops() + 1);
 
     createTile(c);
-
-    if (scene)
-        scene->windowAdded(c);
     return c;
 }
 
@@ -581,8 +578,6 @@ Unmanaged* Workspace::createUnmanaged(Window w)
         return NULL;
     }
     addUnmanaged(c, Allowed);
-    if (scene)
-        scene->windowAdded(c);
     emit unmanagedAdded(c);
     return c;
 }