diff --git a/Changes.md b/Changes.md
index da9fa9142f7..2b212ce7463 100644
--- a/Changes.md
+++ b/Changes.md
@@ -14,6 +14,7 @@ Improvements
   - When viewing the output of a Box, the menu now displays the Edit Scopes contained within.
   - Added support for dropping an Edit Scope node onto the widget to set it as the current Edit Scope.
   - Added support for middle-dragging from the widget to access the current Edit Scope node.
+- ArnoldAttributes : Added syntax highlighting and auto-complete for set expressions on the `shadowGroup` plug.
 
 API
 ---
diff --git a/python/GafferArnoldUI/ArnoldAttributesUI.py b/python/GafferArnoldUI/ArnoldAttributesUI.py
index 028c8db6741..af3bc05b08d 100644
--- a/python/GafferArnoldUI/ArnoldAttributesUI.py
+++ b/python/GafferArnoldUI/ArnoldAttributesUI.py
@@ -258,6 +258,13 @@ def __toonSummary( plug ) :
 			"label", "Shadow Group",
 		],
 
+		"attributes.shadowGroup.value" : [
+
+			"plugValueWidget:type", "GafferSceneUI.SetExpressionPlugValueWidget",
+			"ui:scene:acceptsSetExpression", True,
+
+		],
+
 		"attributes.diffuseReflectionVisibility" : [
 
 			"description",