diff --git a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.cs b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.cs
index 87eb709fa3..bf89308939 100644
--- a/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.cs
+++ b/src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCAudioSettings.cs
@@ -52,15 +52,9 @@ namespace BizHawk.Client.EmuHawk
 				_settings.AYVolume = ayVolumetrackBar.Value;
 
 				_mainForm.PutCoreSettings(_settings);
-
-				DialogResult = DialogResult.OK;
-				Close();
-			}
-			else
-			{
-				DialogResult = DialogResult.OK;
-				Close();
 			}
+			DialogResult = DialogResult.OK;
+			Close();
 		}
 
 		private void CancelBtn_Click(object sender, EventArgs e)
diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.cs
index c5d1247afb..d2f104f74b 100644
--- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.cs
+++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumAudioSettings.cs
@@ -56,14 +56,9 @@ namespace BizHawk.Client.EmuHawk
 				_settings.AYVolume = ayVolumetrackBar.Value;
 
 				_mainForm.PutCoreSettings(_settings);
-				DialogResult = DialogResult.OK;
-				Close();
-			}
-			else
-			{
-				DialogResult = DialogResult.OK;
-				Close();
 			}
+			DialogResult = DialogResult.OK;
+			Close();
 		}
 
 		private void CancelBtn_Click(object sender, EventArgs e)
diff --git a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.cs b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.cs
index ad43b0753b..0808103799 100644
--- a/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.cs
+++ b/src/BizHawk.Client.EmuHawk/config/ZXSpectrum/ZXSpectrumCoreEmulationSettings.cs
@@ -62,15 +62,9 @@ namespace BizHawk.Client.EmuHawk
 				_syncSettings.AutoLoadTape = autoLoadcheckBox1.Checked;
 
 				_mainForm.PutCoreSyncSettings(_syncSettings);
-
-				DialogResult = DialogResult.OK;
-				Close();
-			}
-			else
-			{
-				DialogResult = DialogResult.OK;
-				Close();
 			}
+			DialogResult = DialogResult.OK;
+			Close();
 		}
 
 		private void CancelBtn_Click(object sender, EventArgs e)