diff --git a/Changes.md b/Changes.md
index 97c2f43ddfc..f82f07c8d0f 100644
--- a/Changes.md
+++ b/Changes.md
@@ -27,6 +27,7 @@ Fixes
 - Widget : Fixed `event.sourceWidget` for DragDropEvents generated from a Qt native drag within the same Gaffer process. This will now reference the `GafferUI.Widget` that the Qt source widget belongs to, if any.
 - Catalogue : Fixed bug which "stole" drags that crossed the image listing but which were destined elsewhere, for instance a drag from the HierarchyView to a PathFilter in the GraphEditor.
 - GadgetWidget : Fixed signal handling bug in `setViewportGadget()`. This could cause the widget to attempt to redraw unnecessarily when the _old_ viewport requested a redraw.
+- AttributeEditor, LightEditor, RenderPassEditor : Fixed warning message which referred to "None" rather than the "Source" scope.
 
 API
 ---
diff --git a/python/GafferSceneUITest/ParameterInspectorTest.py b/python/GafferSceneUITest/ParameterInspectorTest.py
index 7cece6205ce..7fcfdc75c37 100644
--- a/python/GafferSceneUITest/ParameterInspectorTest.py
+++ b/python/GafferSceneUITest/ParameterInspectorTest.py
@@ -502,7 +502,7 @@ def testDisableEdit( self ) :
 
 		inspection = self.__inspect( s["editScope"]["out"], "/light", "exposure", s["editScope"] )
 		self.assertFalse( inspection.canDisableEdit() )
-		self.assertEqual( inspection.nonDisableableReason(), "Edit is not in the current edit scope. Change scope to None to disable." )
+		self.assertEqual( inspection.nonDisableableReason(), "Edit is not in the current edit scope. Change scope to Source to disable." )
 
 		inspection = self.__inspect( s["editScope"]["out"], "/light", "exposure", None )
 		self.assertEqual( inspection.source(), s["light"]["parameters"]["exposure"] )
diff --git a/src/GafferSceneUI/Inspector.cpp b/src/GafferSceneUI/Inspector.cpp
index ce4f4b39eef..710eeea455a 100644
--- a/src/GafferSceneUI/Inspector.cpp
+++ b/src/GafferSceneUI/Inspector.cpp
@@ -292,7 +292,7 @@ void Inspector::inspectHistoryWalk( const GafferScene::SceneAlgo::History *histo
 					if( !result->m_editScope && node->ancestor<EditScope>() )
 					{
 						// We don't allow editing if the user hasn't requested a specific scope
-						// (they have selected "None" from the Menu) and the upstream edit is
+						// (they have selected "Source" from the Menu) and the upstream edit is
 						// inside _any_ EditScope.
 						result->m_editFunction = fmt::format(
 							"Source is in an EditScope. Change scope to {} to edit.",
@@ -328,7 +328,7 @@ void Inspector::inspectHistoryWalk( const GafferScene::SceneAlgo::History *histo
 					}
 					else if( !node->ancestor<EditScope>() && result->m_editScope )
 					{
-						result->m_disableEditFunction = "Edit is not in the current edit scope. Change scope to None to disable.";
+						result->m_disableEditFunction = "Edit is not in the current edit scope. Change scope to Source to disable.";
 					}
 				}
 			}