diff --git a/src/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs b/src/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs
index 1cb1a882c3..23e55ccad8 100644
--- a/src/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs
+++ b/src/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs
@@ -91,7 +91,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 
 			dlg.checkBoxASync.Checked = audioSync;
-			DialogResult result = dlg.ShowDialog(owner);
+			var result = owner.ShowDialogAsChild(dlg);
 
 			IVideoWriter ret;
 
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 7cf4c3c4cf..88510b196c 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3460,7 +3460,7 @@ namespace BizHawk.Client.EmuHawk
 		private int? LoadArchiveChooser(HawkFile file)
 		{
 			using var ac = new ArchiveChooser(file);
-			if (ac.ShowDialog(this) == DialogResult.OK)
+			if (ShowDialogAsChild(ac) == DialogResult.OK)
 			{
 				return ac.SelectedMemberIndex;
 			}
@@ -4478,5 +4478,7 @@ namespace BizHawk.Client.EmuHawk
 
 			return isRewinding;
 		}
+
+		public DialogResult ShowDialogAsChild(Form dialog) => dialog.ShowDialog(this);
 	}
 }
diff --git a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs b/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs
index de823dd36f..633a8cdfc7 100644
--- a/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs
+++ b/src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs
@@ -40,7 +40,7 @@ namespace BizHawk.Client.EmuHawk
 			dlg.gbPrefControl1.ColorGameBoy = emu.IsCGBMode(false);
 			dlg.gbPrefControl2.ColorGameBoy = emu.IsCGBMode(true);
 
-			if (dlg.ShowDialog(mainForm) == DialogResult.OK)
+			if (mainForm.ShowDialogAsChild(dlg) == DialogResult.OK)
 			{
 				dlg.GetSettings(out s, out ss);
 				gambatte.PutSettings(s);
diff --git a/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.cs b/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.cs
index 9020e4501e..b815b312e2 100644
--- a/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.cs
+++ b/src/BizHawk.Client.EmuHawk/config/GB/GBPrefs.cs
@@ -18,7 +18,7 @@ namespace BizHawk.Client.EmuHawk
 			using var dlg = new GBPrefs();
 			dlg.gbPrefControl1.PutSettings(s, ss);
 			dlg.gbPrefControl1.ColorGameBoy = gb.IsCGBMode();
-			if (dlg.ShowDialog(mainForm) == DialogResult.OK)
+			if (mainForm.ShowDialogAsChild(dlg) == DialogResult.OK)
 			{
 				dlg.gbPrefControl1.GetSettings(out s, out ss);
 				gb.PutSettings(s);
diff --git a/src/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs b/src/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs
index 8e5590dcc8..56cf5c6023 100644
--- a/src/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs
+++ b/src/BizHawk.Client.EmuHawk/config/GenericCoreConfig.cs
@@ -127,14 +127,14 @@ namespace BizHawk.Client.EmuHawk
 			else
 			{
 				using var dlg = new GenericCoreConfig(owner) { Text = title };
-				dlg.ShowDialog(owner);
+				owner.ShowDialogAsChild(dlg);
 			}
 		}
 
 		public static void DoDialog(MainForm owner, string title, bool hideSettings, bool hideSyncSettings)
 		{
 			using var dlg = new GenericCoreConfig(owner, hideSettings, hideSyncSettings) { Text = title };
-			dlg.ShowDialog(owner);
+			owner.ShowDialogAsChild(dlg);
 		}
 		private void PropertyGrid2_PropertyValueChanged(object s, PropertyValueChangedEventArgs e)
 		{
diff --git a/src/BizHawk.Client.EmuHawk/config/PSX/PSXOptions.cs b/src/BizHawk.Client.EmuHawk/config/PSX/PSXOptions.cs
index 3e99ae8ded..fb6eb804ba 100644
--- a/src/BizHawk.Client.EmuHawk/config/PSX/PSXOptions.cs
+++ b/src/BizHawk.Client.EmuHawk/config/PSX/PSXOptions.cs
@@ -84,7 +84,7 @@ namespace BizHawk.Client.EmuHawk
 			var size = psx.CurrentVideoSize; 
 			using var dlg = new PSXOptions(mainForm, config, s, ss, vid, size);
 
-			var result = dlg.ShowDialog(mainForm);
+			var result = mainForm.ShowDialogAsChild(dlg);
 			return result;
 		}
 
diff --git a/src/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.cs b/src/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.cs
index 37ad50c876..4fc4003cd0 100644
--- a/src/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.cs
+++ b/src/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.cs
@@ -33,7 +33,7 @@ namespace BizHawk.Client.EmuHawk
 				ShowBg4 = s.ShowBG4_0
 			};
 
-			var result = dlg.ShowDialog(mainForm);
+			var result = mainForm.ShowDialogAsChild(dlg);
 			if (result == DialogResult.OK)
 			{
 				s.AlwaysDoubleSize = dlg.AlwaysDoubleSize;