diff --git a/app/src/processing/app/FindReplace.java b/app/src/processing/app/FindReplace.java
index 5b3ad9c66..89435f75f 100644
--- a/app/src/processing/app/FindReplace.java
+++ b/app/src/processing/app/FindReplace.java
@@ -422,7 +422,9 @@ public class FindReplace extends JFrame implements ActionListener {
     if (findField.getText().length() == 0)
       return;
     
-    editor.getSketch().setCurrentCode(0); // select the first tab
+    if (searchAllFiles)
+        editor.getSketch().setCurrentCode(0); // select the first tab
+    
     editor.setSelection(0, 0); // move to the beginning
 
     boolean foundAtLeastOne = false;