diff --git a/containment.cpp b/containment.cpp
index 510a4f068..b033229b1 100644
--- a/containment.cpp
+++ b/containment.cpp
@@ -268,7 +268,7 @@ void Containment::contextMenuEvent(QGraphicsSceneContextMenuEvent* event)
 
 void Containment::setFormFactor(FormFactor formFactor)
 {
-    if (d->formFactor == formFactor) {
+    if (d->formFactor == formFactor && d->layout) {
         return;
     }