diff --git a/Changes.md b/Changes.md
index 894cc9ab84..a3f27fc029 100644
--- a/Changes.md
+++ b/Changes.md
@@ -15,6 +15,7 @@ Fixes
 - Render, InteractiveRender : Added default node name arguments to the compatibility shims for removed subclasses such as ArnoldRender.
 - GafferUITest : Fixed `assertNodeUIsHaveExpectedLifetime()` test for invisible nodes.
 - OpDialogue : Fixed `postExecuteBehaviour` handling.
+- 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 5b77d3b234..cc2223261e 100644
--- a/python/GafferUI/AnimationEditor.py
+++ b/python/GafferUI/AnimationEditor.py
@@ -150,6 +150,7 @@ def __init__( self, scriptNode, **kw ) :
 
 		# Set up the widget responsible for actual curve drawing
 		self.__animationGadget = GafferUI.AnimationGadget()
+		self.__animationGadget.setContext( scriptNode.context() )
 
 		# Set up signals needed to update selection state in PathListingWidget
 		editable = self.__animationGadget.editablePlugs()
@@ -222,10 +223,6 @@ def _updateFromSet( self ) :
 		self.__pathChangedConnection = self.__curveList.getPath().pathChangedSignal().connect( Gaffer.WeakMethod( self.__updateGadgetSets ), scoped = True )
 		self.__updateGadgetSets()
 
-	def _updateFromContext( self, modifiedItems ) :
-
-		self.__animationGadget.setContext( self.context() )
-
 	def __updateGadgetSets( self, unused = None ) :
 
 		visiblePlugs = set()