diff --git a/Lib/idlelib/SearchDialog.py b/Lib/idlelib/SearchDialog.py
index 8d275c4437b6..d7124d67ff2a 100644
--- a/Lib/idlelib/SearchDialog.py
+++ b/Lib/idlelib/SearchDialog.py
@@ -11,7 +11,8 @@ def _setup(text):
     return engine._searchdialog
 
 def find(text):
-    return _setup(text).open(text)
+    pat = text.get("sel.first", "sel.last")
+    return _setup(text).open(text,pat)
 
 def find_again(text):
     return _setup(text).find_again(text)
diff --git a/Lib/idlelib/SearchDialogBase.py b/Lib/idlelib/SearchDialogBase.py
index 3556ebf69f3b..c2a59c5d21c5 100644
--- a/Lib/idlelib/SearchDialogBase.py
+++ b/Lib/idlelib/SearchDialogBase.py
@@ -11,13 +11,16 @@ def __init__(self, root, engine):
         self.engine = engine
         self.top = None
 
-    def open(self, text):
+    def open(self, text, searchphrase=None):
         self.text = text
         if not self.top:
             self.create_widgets()
         else:
             self.top.deiconify()
             self.top.tkraise()
+        if searchphrase:
+            self.ent.delete(0,"end")
+            self.ent.insert("end",searchphrase)
         self.ent.focus_set()
         self.ent.selection_range(0, "end")
         self.ent.icursor(0)