diff --git a/BookmarkForm.cs b/BookmarkForm.cs
index 63bdb23..c9ba0a7 100644
--- a/BookmarkForm.cs
+++ b/BookmarkForm.cs
@@ -297,6 +297,8 @@ namespace FizzyLauncher
             base.OnShown(e);
 
             this.DialogResult = DialogResult.None;
+
+            textBox2.Focus();
         }
 
         protected override void OnClosing(CancelEventArgs e)
diff --git a/MainForm.cs b/MainForm.cs
index 0c9c594..85ba623 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -1184,6 +1184,10 @@ namespace FizzyLauncher
                 Result result = fileHandler.Save(treeView1, filename, password);
                 if (result.IsSuccess)
                 {
+                    this.ApplicationMode = AppMode.Open;
+                    sessionFilename = filename;
+                    sessionPassword = password;
+
                     treeView1.SetNoChanges();
                 }