diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index 45777358f9a28916ad51ac97e97f8f6228c93392..b92b71aa87fdabe8cc6a7e6132f48f04b624f861 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -883,6 +883,8 @@ void PropertyEditor::reloadQml()
 
 QString PropertyEditor::qmlFileName(const NodeMetaInfo &nodeInfo) const
 {
+    if (nodeInfo.typeName().split('/').last() == "QDeclarativeItem")
+        return "Qt/ItemPane.qml";
     return nodeInfo.typeName() + QLatin1String("Pane.qml");
 }
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
index 788418f0a082a961b98971bf1f52c7605259c263..050623411cb594217ef70615cb0397567036464f 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
@@ -35,6 +35,7 @@
 #include <QHash>
 #include <QDeclarativePropertyMap>
 #include <QStackedWidget>
+#include <QTimer>
 
 #include "qmlanchorbindingproxy.h"
 #include "designerpropertymap.h"
@@ -44,6 +45,7 @@
 QT_BEGIN_NAMESPACE
 class QShortcut;
 class QStackedWidget;
+class QTimer;
 QT_END_NAMESPACE
 
 class PropertyEditorValue;
@@ -141,6 +143,7 @@ private: //variables
     NodeType *m_currentType;
     bool m_locked;
     bool m_setupCompleted;
+    QTimer *m_singleShotTimer;
 };