diff --git a/composite.cpp b/composite.cpp
index d8f4f2840a..4dc38190a3 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -883,8 +883,10 @@ bool Client::setupCompositing()
         return false;
     }
     updateVisibility(); // for internalKeep()
-    updateDecoration(true, true);
-    move(calculateGravitation(true)); // we just polluted the gravity because the window likely has no decoration yet
+    if (isManaged()) {
+        // only create the decoration when a client is managed
+        updateDecoration(true, true);
+    }
     return true;
 }