diff --git a/containment.cpp b/containment.cpp
index 6dc73c1be..c86c1ebe2 100644
--- a/containment.cpp
+++ b/containment.cpp
@@ -460,10 +460,16 @@ void ContainmentPrivate::initApplets()
     foreach (Applet *applet, applets) {
         applet->restore(*applet->d->mainConfigGroup());
         applet->init();
-        // We have to flush the applet constraints manually
-        applet->flushPendingConstraintsEvents();
         kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Applet" << applet->name();
     }
+
+    q->flushPendingConstraintsEvents();
+
+    foreach (Applet *applet, applets) {
+        applet->flushPendingConstraintsEvents();
+    }
+
+    kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Containment's applets initialized" << q->name();
 }
 
 void Containment::restoreContents(KConfigGroup &group)
diff --git a/corona.cpp b/corona.cpp
index 500a5a4f0..2b1baf08b 100644
--- a/corona.cpp
+++ b/corona.cpp
@@ -508,7 +508,6 @@ QList<Plasma::Containment *> CoronaPrivate::importLayout(const KConfigBase &conf
 
     foreach (Containment *containment, newContainments) {
         containment->updateConstraints(Plasma::StartupCompletedConstraint);
-        containment->flushPendingConstraintsEvents();
         containment->d->initApplets();
         emit q->containmentAdded(containment);
         kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Containment" << containment->name();