diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml
index c0e10a1ee4c..f6bcae25a3d 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/UrlChooser.qml
@@ -56,7 +56,7 @@ RowLayout {
             x: 2
             anchors.verticalCenter: parent.verticalCenter
             backendValue: urlChooser.backendValue
-            visible: comboBox.enabled
+            visible: urlChooser.enabled
         }
 
         property bool isComplete: false
@@ -92,16 +92,25 @@ RowLayout {
 
             setCurrentText(textValue)
         }
+        onAccepted: {
+            if (!comboBox.isComplete)
+                return;
 
-        onCurrentTextChanged: {
+            if (backendValue.value !== currentText)
+                backendValue.value = currentText;
+        }
+
+        onActivated: {
+            var cText = textAt(index)
+            print(cText)
             if (backendValue === undefined)
                 return;
 
             if (!comboBox.isComplete)
                 return;
 
-            if (backendValue.value !== currentText)
-                backendValue.value = currentText;
+            if (backendValue.value !== cText)
+                backendValue.value = cText;
         }
 
         Component.onCompleted: {
@@ -158,7 +167,8 @@ RowLayout {
             onClicked: {
                 darkPanel.opacity = 1
                 fileModel.openFileDialog()
-                backendValue.value = fileModel.fileName
+                if (fileModel.fileName != "")
+                    backendValue.value = fileModel.fileName
                 darkPanel.opacity = 0
             }
         }