diff --git a/TeraFinder.Plugins/Forms/EditorForm.cs b/TeraFinder.Plugins/Forms/EditorForm.cs
index 226f3310..862f871c 100644
--- a/TeraFinder.Plugins/Forms/EditorForm.cs
+++ b/TeraFinder.Plugins/Forms/EditorForm.cs
@@ -524,7 +524,7 @@ private void btnOpenCalculator_Click(object sender, EventArgs e)
             calcform.NotLinkedSearch = false;
         }
 
-        calcform.Show();
+        calcform.ShowDialog();
     }
 
     private void btnOpenRewardCalculator_Click(object sender, EventArgs e)
@@ -537,7 +537,7 @@ private void btnOpenRewardCalculator_Click(object sender, EventArgs e)
             calcform.NotLinkedSearch = false;
         }
 
-        calcform.Show();
+        calcform.ShowDialog();
     }
 
     private void btnDx_Click(object sender, EventArgs e)
@@ -571,7 +571,7 @@ private void btnRewards_Click(object sender, EventArgs e)
                 CurrEncount.IsDistribution ? DistFixedRewards : TeraFixedRewards, CurrEncount.IsDistribution ? DistLotteryRewards : TeraLotteryRewards, 3);
 
             var form = new RewardListForm(Language, lvl0, lvl1, lvl2, lvl3);
-            form.Show();
+            form.ShowDialog();
         }
     }
 
diff --git a/TeraFinder.Plugins/TeraPlugin.cs b/TeraFinder.Plugins/TeraPlugin.cs
index 8087f0ce..e5932392 100644
--- a/TeraFinder.Plugins/TeraPlugin.cs
+++ b/TeraFinder.Plugins/TeraPlugin.cs
@@ -170,11 +170,11 @@ private void AddPluginControl(ToolStripDropDownItem tools)
         Plugin.DropDownItems.Add(Flags);
         Plugin.DropDownItems.Add(Events);
         Connect.Click += (s, e) => LaunchConnector();
-        Editor.Click += (s, e) => new EditorForm(SAV, PKMEditor, Language, Paldea, Kitakami, Dist, Mighty, TeraFixedRewards, TeraLotteryRewards, DistFixedRewards, DistLotteryRewards, Connection).Show();
+        Editor.Click += (s, e) => new EditorForm(SAV, PKMEditor, Language, Paldea, Kitakami, Dist, Mighty, TeraFixedRewards, TeraLotteryRewards, DistFixedRewards, DistLotteryRewards, Connection).ShowDialog();
         Events.Click += (s, e) => ImportUtil.ImportNews(SAV, ref Dist, ref Mighty, ref DistFixedRewards, ref DistLotteryRewards, language: Language, plugin: true);
-        Flags.Click += (s, e) => new ProgressForm(SAV, Language,Connection).Show();
-        Finder.Click += (s, e) => new CheckerForm(PKMEditor!.PreparePKM(), SAV, Language).Show();
-        Outbreaks.Click += (s, e) => new OutbreakForm(SAV, Language, Connection).Show();
+        Flags.Click += (s, e) => new ProgressForm(SAV, Language,Connection).ShowDialog();
+        Finder.Click += (s, e) => new CheckerForm(PKMEditor!.PreparePKM(), SAV, Language).ShowDialog();
+        Outbreaks.Click += (s, e) => new OutbreakForm(SAV, Language, Connection).ShowDialog();
         tools.DropDownItems.Add(Plugin);
     }
 
@@ -208,13 +208,13 @@ public void LaunchEditor()
     public void LaunchCalculator()
     {
         var editor = new EditorForm(SAV, PKMEditor, Language, Paldea, Kitakami, Dist, Mighty, TeraFixedRewards, TeraLotteryRewards, DistFixedRewards, DistLotteryRewards, Connection);
-        new CalculatorForm(editor).Show();
+        new CalculatorForm(editor).ShowDialog();
     }
 
     public void LaunchRewardCalculator()
     {
         var editor = new EditorForm(SAV, PKMEditor, Language, Paldea, Kitakami, Dist, Mighty, TeraFixedRewards, TeraLotteryRewards, DistFixedRewards, DistLotteryRewards, Connection);
-        new RewardCalcForm(editor).Show();
+        new RewardCalcForm(editor).ShowDialog();
     }
 
     public void LaunchImporter()
@@ -224,17 +224,17 @@ public void LaunchImporter()
 
     public void LaunchGameEditor()
     {
-        new ProgressForm(SAV, Language,Connection).Show();
+        new ProgressForm(SAV, Language,Connection).ShowDialog();
     }
 
     public void LaunchFinder()
     {
-        new CheckerForm(new PK9 { TrainerTID7 = SAV.TrainerTID7, TrainerSID7 = SAV.TrainerSID7 }, SAV, Language).Show();
+        new CheckerForm(new PK9 { TrainerTID7 = SAV.TrainerTID7, TrainerSID7 = SAV.TrainerSID7 }, SAV, Language).ShowDialog();
     }
 
     public void LaunchMassOutbreakEditor()
     {
-        new OutbreakForm(SAV, Language, Connection).Show();
+        new OutbreakForm(SAV, Language, Connection).ShowDialog();
     }
 
     public ConnectionForm LaunchConnector(Form? parent = null)
diff --git a/TeraFinder.Plugins/Utils/GridUtil.cs b/TeraFinder.Plugins/Utils/GridUtil.cs
index 55e648a4..044d47d3 100644
--- a/TeraFinder.Plugins/Utils/GridUtil.cs
+++ b/TeraFinder.Plugins/Utils/GridUtil.cs
@@ -257,7 +257,7 @@ public static void ViewRewards(this DataGridView dataGrid, CalculatorForm f, str
                         encounter!.IsDistribution ? f.Editor.DistFixedRewards : f.Editor.TeraFixedRewards, encounter!.IsDistribution ? f.Editor.DistLotteryRewards : f.Editor.TeraLotteryRewards, 3);
 
                     var form = new RewardListForm(f.Editor.Language, lvl0, lvl1, lvl2, lvl3);
-                    form.Show();
+                    form.ShowDialog();
                 }
                 catch (Exception ex)
                 {