1 files changed, 4 insertions, 2 deletions
diff --git a/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlModel.cpp
index 3d774108..09f7f5e0 100644
--- a/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlModel.cpp
+++ b/src/Authoring/Qt3DStudio/Palettes/Inspector/InspectorControlModel.cpp
@@ -1202,8 +1202,10 @@ void InspectorControlModel::updatePropertyValue(InspectorControlBase *element) c
             return;
         propertySystem->GetInstancePropertyValue(instance, element->m_property, value);
 
-        if (value.getType() == qt3dsdm::DataModelDataType::None)
+        if (value.getType() == qt3dsdm::DataModelDataType::None) {
+            updateValidState(element); // Shader property has type none, still need to update valid
             return;
+        }
 
         const auto metaDataProvider = doc->GetStudioSystem()->GetActionMetaData();
         info = metaDataProvider->GetMetaDataPropertyInfo(
@@ -1508,7 +1510,7 @@ void InspectorControlModel::refresh()
         for (int p = 0; p < group.controlElements.count(); ++p) {
             QVariant& element = group.controlElements[p];
             InspectorControlBase *property = element.value<InspectorControlBase *>();
-            if (property->m_property.Valid()) {
+            if (property->m_property.Valid() || property->m_title == tr("Shader")) {
                 updatePropertyValue(property);
                 updateControlledToggleState(property);
             }