diff --git a/src/qtquick/qml/Button.qml b/src/qtquick/qml/Button.qml
--- a/src/qtquick/qml/Button.qml
+++ b/src/qtquick/qml/Button.qml
@@ -82,12 +82,7 @@
      * changed since the dialog was opened most recently (rather than the lifetime
      * of the instance of the Button component)
      */
-    property var changedEntries
-    Binding {
-        target: component
-        property: "changedEntries"
-        value: ghnsDialog.engine.changedEntries
-    }
+    property alias changedEntries: ghnsDialog.changedEntries
 
     /**
      * If this is true (default is false), the button will be shown when the Kiosk settings are such
diff --git a/src/qtquick/quickengine.cpp b/src/qtquick/quickengine.cpp
--- a/src/qtquick/quickengine.cpp
+++ b/src/qtquick/quickengine.cpp
@@ -269,6 +269,8 @@
 
 void Engine::resetChangedEntries()
 {
-    d->changedEntries.clear();
-    emit changedEntriesChanged();
+    if (!d->changedEntries.isEmpty()) {
+        d->changedEntries.clear();
+        emit changedEntriesChanged();
+    }
 }