diff --git a/ui/gesture/gestures.go b/ui/gesture/gestures.go
index 485a9b19..7ea1f3de 100644
--- a/ui/gesture/gestures.go
+++ b/ui/gesture/gestures.go
@@ -222,6 +222,10 @@ func (s *Scroll) val(p f32.Point) float32 {
 	}
 }
 
+func (s *Scroll) Active() bool {
+	return s.flinger.Active()
+}
+
 func (f *flinger) Init(now time.Time, v0 float32) {
 	f.t0 = now
 	f.v0 = v0
diff --git a/ui/text/editor.go b/ui/text/editor.go
index 9d3a0d01..52f957f1 100644
--- a/ui/text/editor.go
+++ b/ui/text/editor.go
@@ -96,7 +96,6 @@ func (e *Editor) Next() (EditorEvent, bool) {
 		e.scrollOff.Y += sdist
 		soff = e.scrollOff.Y
 	}
-	scrollTo := false
 	for {
 		evt, ok := e.clicker.Next(e.Inputs)
 		if !ok {
@@ -105,16 +104,20 @@ func (e *Editor) Next() (EditorEvent, bool) {
 		switch {
 		case evt.Type == gesture.TypePress && evt.Source == pointer.Mouse,
 			evt.Type == gesture.TypeClick && evt.Source == pointer.Touch:
-			scrollTo = true
 			e.blinkStart = e.Config.Now
 			e.moveCoord(image.Point{
 				X: int(math.Round(float64(evt.Position.X))),
 				Y: int(math.Round(float64(evt.Position.Y))),
 			})
 			e.requestFocus = true
+			if !e.scroller.Active() {
+				e.scrollToCaret()
+			}
 		}
 	}
-	stop := (sdist > 0 && soff >= smax) || (sdist < 0 && soff <= smin)
+	if (sdist > 0 && soff >= smax) || (sdist < 0 && soff <= smin) {
+		e.scroller.Stop()
+	}
 	for {
 		ke, ok := e.Inputs.Next(e)
 		if !ok {
@@ -134,24 +137,18 @@ func (e *Editor) Next() (EditorEvent, bool) {
 				}
 			}
 			if e.command(ke) {
-				stop = true
-				scrollTo = true
+				e.scrollToCaret()
+				e.scroller.Stop()
 			}
 		case key.EditEvent:
-			stop = true
-			scrollTo = true
+			e.scrollToCaret()
+			e.scroller.Stop()
 			e.append(ke.Text)
 		}
 		if e.rr.Changed() {
 			return ChangeEvent{}, true
 		}
 	}
-	if sdist == 0 && scrollTo {
-		e.scrollToCaret()
-	}
-	if stop {
-		e.scroller.Stop()
-	}
 	return nil, false
 }