diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index d53c9d1dd..0974bc0d2 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -1425,7 +1425,7 @@ public class Editor extends JFrame implements RunnerListener {
     menu.addMenuListener(new MenuListener() {
       @Override
       public void menuSelected(MenuEvent e) {
-        boolean enabled = textarea.getSelectedText() != null;
+        boolean enabled = getCurrentTab().getSelectedText() != null;
         cutItem.setEnabled(enabled);
         copyItem.setEnabled(enabled);
       }
diff --git a/app/src/processing/app/SketchController.java b/app/src/processing/app/SketchController.java
index bb6d3b1dc..5ce02a54d 100644
--- a/app/src/processing/app/SketchController.java
+++ b/app/src/processing/app/SketchController.java
@@ -42,6 +42,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;