diff --git a/Lib/lib-tk/FileDialog.py b/Lib/lib-tk/FileDialog.py
index d3c96b8a00f..74e97412513 100644
--- a/Lib/lib-tk/FileDialog.py
+++ b/Lib/lib-tk/FileDialog.py
@@ -122,7 +122,11 @@ def go(self, dir_or_file=os.curdir, pattern="*", default="", key=None):
         self.top.grab_set()
         self.how = None
         self.master.mainloop()          # Exited by self.quit(how)
-        if key: dialogstates[key] = self.get_filter()
+        if key:
+            directory, pattern = self.get_filter()
+            if self.how:
+                directory = os.path.dirname(self.how)
+            dialogstates[key] = directory, pattern
         self.top.destroy()
         return self.how