diff --git a/autotests/coronatest.cpp b/autotests/coronatest.cpp
index 58e1b6996..3967b8c9e 100644
--- a/autotests/coronatest.cpp
+++ b/autotests/coronatest.cpp
@@ -129,7 +129,7 @@ void CoronaTest::cleanupTestCase()
 void CoronaTest::restore()
 {
     m_corona->loadLayout("plasma-test-appletsrc");
-    QCOMPARE(m_corona->containments().count(), 1);
+    QCOMPARE(m_corona->containments().count(), 2);
     QCOMPARE(m_corona->containments().first()->applets().count(), 2);
 }
 
diff --git a/autotests/plasma-test-appletsrc b/autotests/plasma-test-appletsrc
index 677d9f8f4..972cd5997 100644
--- a/autotests/plasma-test-appletsrc
+++ b/autotests/plasma-test-appletsrc
@@ -14,5 +14,13 @@ plugin=invalid
 immutability=1
 plugin=simpleapplet
 
+#empty panel: should emit complete even if empty
+[Containments][4]
+formfactor=2
+immutability=1
+lastScreen=0
+location=4
+plugin=simplecontainment
+
 [General]
 immutability=1
diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp
index 018dcd422..d51a9b8c7 100644
--- a/src/plasma/corona.cpp
+++ b/src/plasma/corona.cpp
@@ -563,7 +563,6 @@ QList<Plasma::Containment *> CoronaPrivate::importLayout(const KConfigGroup &con
                     if (!ready) {
                         return;
                     }
-
                     --containmentsStarting;
                     if (containmentsStarting <= 0) {
                         emit q->startupCompleted();
diff --git a/src/plasma/private/containment_p.cpp b/src/plasma/private/containment_p.cpp
index 616bc9342..383677226 100644
--- a/src/plasma/private/containment_p.cpp
+++ b/src/plasma/private/containment_p.cpp
@@ -246,7 +246,7 @@ void ContainmentPrivate::setUiReady()
     //if we are the containment and there is still some uncomplete applet, we're still incomplete
     if (!uiReady) {
         uiReady = true;
-        if (q->Applet::d->started && appletsUiReady && loadingApplets.isEmpty()) {
+        if (q->Applet::d->started && (appletsUiReady || applets.isEmpty()) && loadingApplets.isEmpty()) {
             emit q->uiReadyChanged(true);
         }
     }