diff -r 79df7bfc83ab utilities/nbproject/project.xml
--- a/utilities/nbproject/project.xml	Fri Apr 11 15:03:29 2008 +0400
+++ b/utilities/nbproject/project.xml	Fri Apr 11 16:58:26 2008 +0200
@@ -64,6 +64,15 @@ made subject to such option by the copyr
                     </run-dependency>
                 </dependency>
                 <dependency>
+                    <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.6</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
                     <code-name-base>org.netbeans.modules.queries</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
diff -r 79df7bfc83ab utilities/src/org/netbeans/modules/search/BasicSearchForm.java
--- a/utilities/src/org/netbeans/modules/search/BasicSearchForm.java	Fri Apr 11 15:03:29 2008 +0400
+++ b/utilities/src/org/netbeans/modules/search/BasicSearchForm.java	Fri Apr 11 16:58:26 2008 +0200
@@ -85,6 +85,7 @@ import org.jdesktop.layout.GroupLayout.P
 import org.jdesktop.layout.GroupLayout.ParallelGroup;
 import org.jdesktop.layout.GroupLayout.SequentialGroup;
 import org.jdesktop.layout.LayoutStyle;
+import org.netbeans.api.editor.EditorRegistry;
 import org.openide.ErrorManager;
 import org.openide.awt.Mnemonics;
 import org.openide.util.Exceptions;
@@ -136,7 +137,7 @@ final class BasicSearchForm extends JPan
              * BasicSearchCriteria.isSearchAndReplace() would return 'false'. */
             searchCriteria.setReplaceString("");                        //NOI18N
         }
-
+        
         /*
          * Interaction must be already set up when we set values, otherwise
          * state of the dialog might not be corresponding to the values,
@@ -147,6 +148,19 @@ final class BasicSearchForm extends JPan
             initPreviousValues();
         } else {
             initValuesFromHistory();
+        }
+        
+        /* Search for text selected editor */
+        JTextComponent c = EditorRegistry.lastFocusedComponent();
+        if (c != null) {
+            String selText = c.getSelectedText();
+            if (selText != null && selText.length() > 0) {
+                int n = selText.indexOf( '\n' );
+                if (n >= 0 ) selText = selText.substring(0, n);
+                cboxTextToFind.setSelectedIndex(-1);
+                textToFindEditor.setText(selText);
+                searchCriteria.setTextPattern(selText);
+            }
         }
     }