diff --git a/Changes.md b/Changes.md
index bd149aab715..1650bd6d098 100644
--- a/Changes.md
+++ b/Changes.md
@@ -19,6 +19,7 @@ Fixes
 - OpDialogue : Fixed `postExecuteBehaviour` handling.
 - LocalDispatcher : Fixed job status update when a job was killed _immediately_ after being launched.
 - `gaffer view` : Fixed default OpenColorIO display transform.
+- AnimationEditor : Fixed changing of the current frame by dragging the frame indicator or clicking on the time axis.
 
 API
 ---
diff --git a/python/GafferUI/AnimationEditor.py b/python/GafferUI/AnimationEditor.py
index 5b77d3b234a..32173aafb0e 100644
--- a/python/GafferUI/AnimationEditor.py
+++ b/python/GafferUI/AnimationEditor.py
@@ -224,7 +224,14 @@ def _updateFromSet( self ) :
 
 	def _updateFromContext( self, modifiedItems ) :
 
-		self.__animationGadget.setContext( self.context() )
+		# Note that we're passing `scriptNode().context()` rather than
+		# `self.context()` because we don't want to use a ContextTracker-based
+		# context in the AnimationEditor.
+		## \todo It would be better if `AnimationGadget::setContext()` connected
+		# to `Context::changedSignal()` and updated automatically after that. We
+		# could also consider removing `setContext()` entirely and connecting to
+		# the ScriptNode's context in the AnimationGadget constructor.
+		self.__animationGadget.setContext( self.scriptNode().context() )
 
 	def __updateGadgetSets( self, unused = None ) :