diff --git a/UnionPatcher.Gui/Forms/ModeSelectionForm.cs b/UnionPatcher.Gui/Forms/ModeSelectionForm.cs
index e121e05..a39a4bd 100644
--- a/UnionPatcher.Gui/Forms/ModeSelectionForm.cs
+++ b/UnionPatcher.Gui/Forms/ModeSelectionForm.cs
@@ -27,14 +27,24 @@ public ModeSelectionForm() {
     }
     
     private void openRemotePatcher(object sender, EventArgs e) {
-        new RemotePatchForm().Show();
-        this.Close();
+        RemotePatchForm rpForm = new RemotePatchForm();
+        rpForm.Show();
+        rpForm.Closed += OnSubFormClose;
+
+        this.Visible = false;
     }
     private void openLocalPatcher(object sender, EventArgs e) {
         throw new NotImplementedException();
     }
     private void openFilePatcher(object sender, EventArgs e) {
-        new FilePatchForm().Show();
+        FilePatchForm fpForm = new FilePatchForm();
+        fpForm.Show();
+        fpForm.Closed += OnSubFormClose;
+
+        this.Visible = false;
+    }
+    private void OnSubFormClose(object sender, EventArgs e)
+    {
         this.Close();
     }