diff --git a/PKHeX.WinForms/Resources/text/shortcuts.txt b/PKHeX.WinForms/Resources/text/shortcuts.txt
index 7195fe319..181c29476 100644
--- a/PKHeX.WinForms/Resources/text/shortcuts.txt
+++ b/PKHeX.WinForms/Resources/text/shortcuts.txt
@@ -8,7 +8,8 @@ CTRL-E: Export SAV
 CTRL-B: Export BAK
 CTRL-Q: Quit
 
-CTRL-D: Open Database
+CTRL-D: Open PKM Database
+CTRL-F: Open Folder
 CTRL-G: Open Mystery Gift Database
 CTRL-R: Open Box Report
 CTRL-P: Open About PKHeX
diff --git a/PKHeX.WinForms/Subforms/SAV_FolderList.cs b/PKHeX.WinForms/Subforms/SAV_FolderList.cs
index f0a04a885..ea6c88296 100644
--- a/PKHeX.WinForms/Subforms/SAV_FolderList.cs
+++ b/PKHeX.WinForms/Subforms/SAV_FolderList.cs
@@ -41,7 +41,10 @@ namespace PKHeX.WinForms
             button.Click += (s, e) =>
             {
                 if (Directory.Exists(path))
+                {
                     Process.Start("explorer.exe", path);
+                    Close();
+                }
                 else
                     WinFormsUtil.Alert("Can't find folder:", path);
             };