diff --git a/src/formeditor/form.cpp b/src/formeditor/form.cpp
--- a/src/formeditor/form.cpp
+++ b/src/formeditor/form.cpp
@@ -1589,7 +1589,8 @@
                                        paletteForegroundColorDesc);
     d->propertySet.addProperty(newProp);
 
-    d->propertySet["objectName"].setAutoSync(false); // name should be updated only when pressing Enter
+    // name should be updated only when pressing Enter
+    d->propertySet["objectName"].setValueSyncPolicy(KProperty::ValueSyncPolicy::FocusOut);
 
     if (winfo) {
         library()->setPropertyOptions(d->propertySet, *winfo, w);
diff --git a/src/main/KexiMainWindow.cpp b/src/main/KexiMainWindow.cpp
--- a/src/main/KexiMainWindow.cpp
+++ b/src/main/KexiMainWindow.cpp
@@ -3600,7 +3600,7 @@
         if (!newSet || (force || static_cast<KPropertySet*>(d->propertySet) != newSet)) {
             d->propertySet = newSet;
             if (preservePrevSelection || force) {
-                KPropertyEditorView::SetOptions options = KPropertyEditorView::ExpandChildItems;
+                KPropertyEditorView::SetOptions options;
                 if (preservePrevSelection) {
                     options |= KPropertyEditorView::PreservePreviousSelection;
                 }