diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index cfbe5931e..f0dfe17b2 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -1409,6 +1409,8 @@ public abstract class Editor extends JFrame implements RunnerListener {
     if (compoundEdit != null) {
       compoundEdit.end();
       undo.addEdit(compoundEdit);
+      caretUndoStack.push(textarea.getCaretPosition());
+      caretRedoStack.clear();
       undoAction.updateUndoState();
       redoAction.updateRedoState();
       compoundEdit = null;