diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index c1e5df5a581baebfdc4efcece73440e419640ffb..94a9f95aa7d14afccd6bb3e82b787efafadba69f 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -671,6 +671,8 @@ void PropertyEditor::resetView()
     if (m_collapseButton->isCollapsed())
         return;
 
+    m_locked = true;
+
     if (debug)
         qDebug() << "________________ RELOADING PROPERTY EDITOR QML _______________________";
 
@@ -686,8 +688,6 @@ void PropertyEditor::resetView()
     if (m_selectedNode.isValid())
         qmlSpecificsFile = fileToUrl(locateQmlFile(m_selectedNode.type() + "Specifics.qml"));
 
-    m_locked = true;
-
     QString specificQmlData;
 
     if (m_selectedNode.isValid() && !QFileInfo(qmlSpecificsFile.toLocalFile()).exists() && m_selectedNode.metaInfo().isValid()) {
@@ -778,11 +778,15 @@ void PropertyEditor::modelAttached(Model *model)
     if (debug)
         qDebug() << Q_FUNC_INFO;
 
+    m_locked = true;
+
     setupPane("Qt/Rectangle");
     setupPane("Qt/Text");
     setupPane("Qt/TextInput");
     setupPane("Qt/TextEdit");
     resetView();
+
+    m_locked = false;
 }
 
 void PropertyEditor::modelAboutToBeDetached(Model *model)