diff --git a/Changes.md b/Changes.md
index 398a991a2e1..6205de9b911 100644
--- a/Changes.md
+++ b/Changes.md
@@ -15,6 +15,7 @@ Improvements
 - Spreadsheet :
   - Popups for string cells and row names are now sized to fit their column.
   - Added "Triple" and "Quadruple" width options to the spreadsheet row name popup menu.
+- LightTool : Changed spot light tool tip location so that it follows the cone during drag.
 
 1.3.4.0 (relative to 1.3.3.0)
 =======
diff --git a/src/GafferSceneUI/LightTool.cpp b/src/GafferSceneUI/LightTool.cpp
index eac21ca542d..9dceb4aeaff 100644
--- a/src/GafferSceneUI/LightTool.cpp
+++ b/src/GafferSceneUI/LightTool.cpp
@@ -1882,6 +1882,12 @@ class SpotLightHandle : public LightToolHandle
 				return;
 			}
 
+			if( m_drag )
+			{
+				setTooltipPosition( V3f( 0, 0, -m_arcRadius ) * r );
+				return;
+			}
+
 			const Line3f rayLine(
 				V3f( 0 ),
 				V3f( 0, 0, m_visualiserScale * m_frustumScale * -10.f ) * r