diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
index 0ebc577c90d..4d9c17c2b83 100644
--- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
@@ -477,9 +477,9 @@ QString AbstractView::generateNewId(const QString &prefixName) const
     QString newId = QString(QStringLiteral("%1")).arg(firstCharToLower(prefixName));
     newId.remove(QRegExp(QStringLiteral("[^a-zA-Z0-9_]")));
 
-    while (hasId(newId) || rootModelNode().hasProperty(newId.toUtf8()) || newId == "item") {
+    while (!ModelNode::isValidId(newId) || hasId(newId) || rootModelNode().hasProperty(newId.toUtf8()) || newId == "item") {
         counter += 1;
-        newId = QString(QStringLiteral("%1%2")).arg(firstCharToLower(prefixName)).arg(counter);
+        newId = QString(QStringLiteral("%1%2")).arg(firstCharToLower(prefixName)).arg(counter - 1);
         newId.remove(QRegExp(QStringLiteral("[^a-zA-Z0-9_]")));
     }
 
diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
index e847c109551..3fe7e9ce2e2 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
@@ -143,8 +143,34 @@ QString ModelNode::validId()
 
 static bool idIsQmlKeyWord(const QString& id)
 {
-    QStringList keywords;
-    keywords << QLatin1String("import") << QLatin1String("as");
+    QStringList keywords = { "import",
+                             "as",
+                             "break",
+                             "case",
+                             "catch",
+                             "continue",
+                             "debugger",
+                             "default",
+                             "delete",
+                             "do",
+                             "else",
+                             "finally",
+                             "for",
+                             "function",
+                             "if",
+                             "in",
+                             "instanceof",
+                             "new",
+                             "return",
+                             "switch",
+                             "this",
+                             "throw",
+                             "try",
+                             "typeof",
+                             "var",
+                             "void",
+                             "while",
+                             "with" };
 
     return keywords.contains(id);
 }