1 files changed, 12 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/collectioneditor/collectionview.cpp b/src/plugins/qmldesigner/components/collectioneditor/collectionview.cpp
index 1b1d1a7d9f..f2075b4abb 100644
--- a/src/plugins/qmldesigner/components/collectioneditor/collectionview.cpp
+++ b/src/plugins/qmldesigner/components/collectioneditor/collectionview.cpp
@@ -226,7 +226,18 @@ void CollectionView::addResource(const QUrl &url, const QString &name, const QSt
 void CollectionView::assignCollectionToSelectedNode(const QString &collectionName)
 {
     QTC_ASSERT(dataStoreNode() && hasSingleSelectedModelNode(), return);
-    m_dataStore->assignCollectionToNode(this, singleSelectedModelNode(), collectionName);
+    m_dataStore->assignCollectionToNode(
+        this,
+        singleSelectedModelNode(),
+        collectionName,
+        [&](const QString &collectionName, const QString &columnName) -> bool {
+            const CollectionReference reference{dataStoreNode(), collectionName};
+            return m_widget->collectionDetailsModel()->collectionHasColumn(reference, columnName);
+        },
+        [&](const QString &collectionName) -> QString {
+            const CollectionReference reference{dataStoreNode(), collectionName};
+            return m_widget->collectionDetailsModel()->getFirstColumnName(reference);
+        });
 }
 
 void CollectionView::registerDeclarativeType()