diff --git a/Changes.md b/Changes.md
index 66e7636a083..d4f6ea6209a 100644
--- a/Changes.md
+++ b/Changes.md
@@ -16,6 +16,7 @@ Fixes
 -----
 
 - PlugAlgo : Updated `canSetValueFromData()`, `setValueFromData()` and `getValueAsData()` with support for missing types.
+- LightPosition Tool : Fixed lingering shadow pivot point after placing a shadow pivot, switching to highlight mode and switching back to shadow mode [^1].
 
 1.4.0.0b4 (relative to 1.4.0.0b3)
 =========
diff --git a/src/GafferSceneUI/LightPositionTool.cpp b/src/GafferSceneUI/LightPositionTool.cpp
index 653de1c407d..9a025bb0d86 100644
--- a/src/GafferSceneUI/LightPositionTool.cpp
+++ b/src/GafferSceneUI/LightPositionTool.cpp
@@ -926,6 +926,7 @@ void LightPositionTool::plugSet( Plug *plug )
 	{
 		auto h = static_cast<DistanceHandle *>( m_distanceHandle.get() );
 		h->setRequiresPivot( modePlug()->getValue() == (int)Mode::Shadow );
+		updateHandles( m_rotateHandle->getRasterScale() );
 	}
 }