#17511: merge with 3.3.

3 files changed, 6 insertions, 3 deletions

diff --git a/Lib/idlelib/SearchDialog.py b/Lib/idlelib/SearchDialog.py
index 76c444c6c1..bf76c419ac 100644
--- a/Lib/idlelib/SearchDialog.py
+++ b/Lib/idlelib/SearchDialog.py
@@ -24,13 +24,12 @@ class SearchDialog(SearchDialogBase):
 
     def create_widgets(self):
         f = SearchDialogBase.create_widgets(self)
-        self.make_button("Find", self.default_command, 1)
+        self.make_button("Find Next", self.default_command, 1)
 
     def default_command(self, event=None):
         if not self.engine.getprog():
             return
-        if self.find_again(self.text):
-            self.close()
+        self.find_again(self.text)
 
     def find_again(self, text):
         if not self.engine.getpat():
diff --git a/Misc/ACKS b/Misc/ACKS
index 8dea0ad39f..bff2f3c3e8 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -617,6 +617,7 @@ John Jorgensen
 Sijin Joseph
 Andreas Jung
 Tattoo Mabonzo K.
+Sarah K.
 Bohuslav Kabrda
 Alexey Kachayev
 Bob Kahn
diff --git a/Misc/NEWS b/Misc/NEWS
index d0165c6480..aa99407fe3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -453,6 +453,9 @@ C-API
 IDLE
 ----
 
+- Issue #17511: Keep IDLE find dialog open after clicking "Find Next".
+  Original patch by Sarah K.
+
 - Issue #18055: Move IDLE off of imp and on to importlib.
 
 - Issue #15392: Create a unittest framework for IDLE.