diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml
index 56a508377ec..cf9c3d668b0 100644
--- a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml
+++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml
@@ -12,6 +12,8 @@ import EffectMakerBackend
 HelperWidgets.Section {
     id: root
 
+    property int modelIndex: 0
+
     caption: nodeName
     category: "EffectMaker"
 
@@ -21,7 +23,7 @@ HelperWidgets.Section {
     closeButtonToolTip: qsTr("Remove")
 
     onCloseButtonClicked: {
-        EffectMakerBackend.effectMakerModel.removeNode(root.index)
+        EffectMakerBackend.effectMakerModel.removeNode(root.modelIndex)
     }
 
     showEyeButton: true
diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMaker.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMaker.qml
index a60b41acf31..3476b084552 100644
--- a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMaker.qml
+++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectMaker.qml
@@ -96,6 +96,7 @@ Item {
 
                     delegate: EffectCompositionNode {
                         width: root.width
+                        modelIndex: index
 
                         Behavior on y {
                             PropertyAnimation {