diff --git a/Changes.md b/Changes.md
index 00644529466..5f852568044 100644
--- a/Changes.md
+++ b/Changes.md
@@ -15,6 +15,7 @@ Fixes
 -----
 
 - Viewer : Fixed crash when visualising lights with a light filter intended for a different renderer.
+- PlugValueWidget : Fixed search for auxiliary plugs of output plugs. In this case, the inputs are now searched instead of the outputs.
 
 API
 ---
diff --git a/python/GafferUI/PlugValueWidget.py b/python/GafferUI/PlugValueWidget.py
index 53c6f80c42f..0391a73460a 100644
--- a/python/GafferUI/PlugValueWidget.py
+++ b/python/GafferUI/PlugValueWidget.py
@@ -695,7 +695,10 @@ def __setPlugsInternal( self, plugs, callUpdateMethods ) :
 		self.__auxiliaryPlugs = []
 		auxiliaryNodes = set()
 		for plug in self.__plugs :
-			auxiliaryPlugs = Gaffer.PlugAlgo.findDestination( plug, lambda plug : self._auxiliaryPlugs( plug ) ) or []
+			if plug.direction() == Gaffer.Plug.Direction.In :
+				auxiliaryPlugs = Gaffer.PlugAlgo.findDestination( plug, lambda plug : self._auxiliaryPlugs( plug ) ) or []
+			else :
+				auxiliaryPlugs = Gaffer.PlugAlgo.findSource( plug, lambda plug : self._auxiliaryPlugs( plug ) ) or []
 			self.__auxiliaryPlugs.append( auxiliaryPlugs )
 			auxiliaryNodes.update( [ plug.node() for plug in auxiliaryPlugs ] )
 			# > Note : Which `auxiliaryPlugs` we find depends on the output connections