1 files changed, 19 insertions, 1 deletions
diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsEditDelegate.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsEditDelegate.qml
index 6a3146a818..90b3021c96 100644
--- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsEditDelegate.qml
+++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionDetailsEditDelegate.qml
@@ -91,6 +91,11 @@ Item {
                     realStepSize: 1.0
                     decimals: 6
                     trailingZeroes: false
+
+                    onActiveFocusChanged: {
+                        if (realField.activeFocus)
+                            realField.contentItem.focus = true
+                    }
                 }
             }
         }
@@ -112,6 +117,11 @@ Item {
                     from: -2147483647
                     to: 2147483647
                     decimals: 0
+
+                    onActiveFocusChanged: {
+                        if (integerField.activeFocus)
+                            integerField.contentItem.focus = true
+                    }
                 }
             }
         }
@@ -149,7 +159,7 @@ Item {
             target: editorPopup.editor
 
             function onActiveFocusChanged() {
-                if (!editorPopup.activeFocus)
+                if (!editorPopup.editor.activeFocus)
                     editorPopup.close()
                 else if (edit)
                     editorPopup.editor.editValue = edit
@@ -163,6 +173,14 @@ Item {
                 editorLoader.changesAccepted = false
                 editorPopup.close()
             }
+
+            function onReturnPressed() {
+                editorPopup.close()
+            }
+
+            function onEnterPressed() {
+                editorPopup.close()
+            }
         }
     }