diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 278b54840..2138974d3 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -1236,6 +1236,7 @@ public class Editor extends JFrame implements RunnerListener {
           if (find == null) {
             find = new FindReplace(Editor.this);
           }
+          if (getSelectedText()!= null) find.setFindText( getSelectedText() );
           //new FindReplace(Editor.this).show();
           find.setVisible(true);
           //find.setVisible(true);