diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index a07443af5fd..f8da416b17c 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -827,6 +827,8 @@ NodeMetaInfoPrivate::NodeMetaInfoPrivate(Model *model, TypeName type, int maj, i
                     if (importInfo.type() == ImportType::Library) {
                         m_majorVersion = importInfo.version().majorVersion();
                         m_minorVersion = importInfo.version().minorVersion();
+                    } else {
+                        m_isFileComponent = true;
                     }
 
                     m_qualfiedTypeName = getUnqualifiedName(m_qualfiedTypeName);
@@ -835,6 +837,8 @@ NodeMetaInfoPrivate::NodeMetaInfoPrivate(Model *model, TypeName type, int maj, i
                                         || importInfo.type() == ImportType::Directory);
                     if (prepandName)
                         m_qualfiedTypeName.prepend(importInfo.name().toUtf8() + '.');
+
+                    m_qualfiedTypeName.replace("/", ".");
                 }
 
                 m_objectValue = getObjectValue();
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 2a5471be8f4..1a0d3ae9c33 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -531,7 +531,7 @@ public:
                 qDebug() << metaInfo.isValid() << metaInfo.typeName();
                 qDebug() << metaInfo.directSuperClass().typeName();
 
-                if (!typeName.startsWith("...") && m_model == m_model->metaInfoProxyModel()
+                if (!metaInfo.isFileComponent() && m_model == m_model->metaInfoProxyModel()
                     && metaInfo.isValid())
                     throw RewritingException(__LINE__, __FUNCTION__, __FILE__, "test", "test");
             }