diff --git a/Changes.md b/Changes.md
index 85c643a3eab..8284ad60711 100644
--- a/Changes.md
+++ b/Changes.md
@@ -14,6 +14,7 @@ Fixes
 - PythonCommand : Fixed misleading results for `repr( variables )` and `str( variables )`, which would suggest the dictionary was empty when it was not.
 - CompoundObject : Fixed crashes in Python bindings caused by passing `None` as a key.
 - Windows : Fixed "{path} was unexpected at this time." startup error when environment variables such as `PATH` contain `"` characters.
+- PathListingWidget : Fixed bug which caused the pointer to be stuck displaying the "values" icon after dragging cells with no value.
 
 Build
 -----
diff --git a/python/GafferUI/PathListingWidget.py b/python/GafferUI/PathListingWidget.py
index 4354b325a3d..fcac5090e94 100644
--- a/python/GafferUI/PathListingWidget.py
+++ b/python/GafferUI/PathListingWidget.py
@@ -734,9 +734,11 @@ def __dragBegin( self, widget, event ) :
 
 		index = self.__indexAt( event.line.p0 )
 		if index is not None :
-			GafferUI.Pointer.setCurrent( "values" )
+			value = self.getColumns()[index.column()].cellData( path ).value
+			if value is not None :
+				GafferUI.Pointer.setCurrent( "values" )
 
-			return self.getColumns()[index.column()].cellData( path ).value
+				return value
 
 		return None