diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
index 3a211f181..dd248528c 100644
--- a/app/src/processing/app/ui/Editor.java
+++ b/app/src/processing/app/ui/Editor.java
@@ -2669,7 +2669,11 @@ public abstract class Editor extends JFrame implements RunnerListener {
 
     // make sure any edits have been stored
     //current.setProgram(editor.getText());
-    sketch.getCurrentCode().setProgram(getText());
+    for (SketchCode sc : sketch.getCode()) {
+      try {
+        sc.setProgram(sc.getDocumentText());
+      } catch (BadLocationException e) { }
+    }
 
 //    // if an external editor is being used, need to grab the
 //    // latest version of the code from the file.
diff --git a/java/src/processing/mode/java/pdex/PDEX.java b/java/src/processing/mode/java/pdex/PDEX.java
index 8074e9efe..8d500e531 100644
--- a/java/src/processing/mode/java/pdex/PDEX.java
+++ b/java/src/processing/mode/java/pdex/PDEX.java
@@ -51,14 +51,16 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 import javax.swing.JTree;
+import javax.swing.text.BadLocationException;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeModel;
 
 import processing.app.Messages;
-import processing.app.Preferences;
 import processing.app.Sketch;
+import processing.app.SketchCode;
+import processing.app.syntax.SyntaxDocument;
 import processing.app.ui.EditorStatus;
 import processing.app.ui.Toolkit;
 import processing.mode.java.JavaEditor;
@@ -657,7 +659,9 @@ public class PDEX {
       final int currentOffset = editor.getCaretOffset();
       mappedNodes.entrySet().forEach(entry -> {
         int tabIndex = entry.getKey();
-        sketch.setCurrentCode(tabIndex);
+        SketchCode sketchCode = sketch.getCode(tabIndex);
+
+        SyntaxDocument document = (SyntaxDocument) sketchCode.getDocument();
 
         List<SketchInterval> nodes = entry.getValue();
         nodes.stream()
@@ -665,16 +669,23 @@ public class PDEX {
             .sorted(Comparator.comparing((SketchInterval si) -> si.startTabOffset).reversed())
             .forEach(si -> {
               // Make sure offsets are in bounds
-              int length = editor.getTextArea().getDocumentLength();
-              if (si.startTabOffset >= 0 && si.startTabOffset <= length &&
-                  si.stopTabOffset >= 0 && si.stopTabOffset <= length) {
+              int documentLength = document.getLength();
+              if (si.startTabOffset >= 0 && si.startTabOffset <= documentLength &&
+                  si.stopTabOffset >= 0 && si.stopTabOffset <= documentLength) {
                 // Replace the code
-                editor.getTextArea().select(si.startTabOffset, si.stopTabOffset);
-                editor.getTextArea().setSelectedText(newName);
+                int length = si.stopTabOffset - si.startTabOffset;
+                try {
+                  document.remove(si.startTabOffset, length);
+                  document.insertString(si.startTabOffset, newName, null);
+                } catch (BadLocationException e) { /* Whatever */ }
               }
             });
 
-        sketch.setModified(true);
+        try {
+          sketchCode.setProgram(document.getText(0, document.getLength()));
+        } catch (BadLocationException e) { /* Whatever */ }
+        sketchCode.setModified(true);
+        editor.repaintHeader();
       });
 
       int precedingIntervals =
diff --git a/java/src/processing/mode/java/pdex/PreprocessingService.java b/java/src/processing/mode/java/pdex/PreprocessingService.java
index 85e7ae24e..f6785219b 100644
--- a/java/src/processing/mode/java/pdex/PreprocessingService.java
+++ b/java/src/processing/mode/java/pdex/PreprocessingService.java
@@ -261,14 +261,10 @@ public class PreprocessingService {
     for (SketchCode sc : sketch.getCode()) {
       if (sc.isExtension("pde")) {
         tabStartsList.append(workBuffer.length());
-        if (sketch.getCurrentCode().equals(sc)) {
-          try {
-            workBuffer.append(sc.getDocumentText());
-          } catch (BadLocationException e) {
-            e.printStackTrace();
-          }
-        } else {
-          workBuffer.append(sc.getProgram());
+        try {
+          workBuffer.append(sc.getDocumentText());
+        } catch (BadLocationException e) {
+          e.printStackTrace();
         }
         workBuffer.append('\n');
       }