diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 25a4c24..81d9470 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -534,11 +534,14 @@
 
     def maybesave(self):
         if self.io:
+            if not self.get_saved():
+                if self.top.state()!='normal': 
+                    self.top.deiconify()
+                self.top.lower()
+                self.top.lift()
             return self.io.maybesave()
 
     def close(self):
-        self.top.wm_deiconify()
-        self.top.tkraise()
         reply = self.maybesave()
         if reply != "cancel":
             self._close()