diff --git a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml
index 9b0046f67c3..56a508377ec 100644
--- a/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml
+++ b/share/qtcreator/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml
@@ -12,14 +12,7 @@ import EffectMakerBackend
 HelperWidgets.Section {
     id: root
 
-    // model properties
-    required property string nodeName
-    required property bool nodeEnabled
-    required property var nodeUniformsModel
-
-    required property int index
-
-    caption: root.nodeName
+    caption: nodeName
     category: "EffectMaker"
 
     draggable: true
@@ -32,18 +25,18 @@ HelperWidgets.Section {
     }
 
     showEyeButton: true
-    eyeEnabled: root.nodeEnabled
+    eyeEnabled: nodeEnabled
     eyeButtonToolTip: qsTr("Enable/Disable Node")
 
     onEyeButtonClicked: {
-        root.nodeEnabled = root.eyeEnabled
+        nodeEnabled = root.eyeEnabled
     }
 
     Column {
         spacing: 10
 
         Repeater {
-            model: root.nodeUniformsModel
+            model: nodeUniformsModel
 
             EffectCompositionNodeUniform {
                 width: root.width
diff --git a/src/plugins/effectmakernew/effectmakermodel.cpp b/src/plugins/effectmakernew/effectmakermodel.cpp
index 65896f66af1..16f7effb7c1 100644
--- a/src/plugins/effectmakernew/effectmakermodel.cpp
+++ b/src/plugins/effectmakernew/effectmakermodel.cpp
@@ -13,7 +13,7 @@
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/target.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/qtcassert.h>
 #include <utils/process.h>
@@ -93,6 +93,8 @@ bool EffectMakerModel::setData(const QModelIndex &index, const QVariant &value,
 
     if (role == EnabledRole) {
         m_nodes.at(index.row())->setIsEnabled(value.toBool());
+        bakeShaders();
+
         emit dataChanged(index, index, {role});
     }
 
@@ -1060,4 +1062,3 @@ void EffectMakerModel::clearImageWatchers()
 }
 
 } // namespace EffectMaker
-