diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
index 2107ad9cac6c4b7e73c3e316a4b4af81baa79d6b..e515fff62c6566adc4b28a5de541eeb139224012 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
@@ -31,6 +31,7 @@
 #include "formeditorscene.h"
 
 #include <modelnode.h>
+#include <nodemetainfo.h>
 
 
 #include <QDebug>
@@ -361,6 +362,11 @@ QList<FormEditorItem*> FormEditorItem::childFormEditorItems() const
 
 bool FormEditorItem::isContainer() const
 {
+    NodeMetaInfo nodeMetaInfo = qmlItemNode().modelNode().metaInfo();
+
+    if (nodeMetaInfo.isValid())
+        return !nodeMetaInfo.defaultPropertyIsComponent();
+
     return true;
 }