diff --git a/src/BizHawk.Client.DiscoHawk/AudioExtractor.cs b/src/BizHawk.Client.DiscoHawk/AudioExtractor.cs
index e84d765b10..7c92bfdd1b 100644
--- a/src/BizHawk.Client.DiscoHawk/AudioExtractor.cs
+++ b/src/BizHawk.Client.DiscoHawk/AudioExtractor.cs
@@ -1,4 +1,4 @@
-using System.Windows.Forms;
+using System;
 using System.Threading.Tasks;
 using System.IO;
 using BizHawk.Emulation.DiscSystem;
@@ -11,12 +11,12 @@ namespace BizHawk.Client.DiscoHawk
 	{
 		public static string FFmpegPath;
 
-		public static void Extract(Disc disc, string path, string fileBase)
+		public static void Extract(Disc disc, string path, string fileBase, Func<bool?> getOverwritePolicy)
 		{
 			var dsr = new DiscSectorReader(disc);
 
 			var shouldHalt = false;
-			bool? overwriteExisting = null; // true = overwrite, false = skip existing (unimplemented), null = unset
+			bool? overwriteExisting = null; // true = overwrite, false = skip existing, null = unset
 
 			var tracks = disc.Session1.Tracks;
 			Parallel.ForEach(tracks, track =>
@@ -41,18 +41,18 @@ namespace BizHawk.Client.DiscoHawk
 				string mp3Path = $"{Path.Combine(path, fileBase)} - Track {track.Number:D2}.mp3";
 				if (File.Exists(mp3Path))
 				{
-					if (overwriteExisting is null)
+					overwriteExisting ??= getOverwritePolicy();
+					switch (overwriteExisting)
 					{
-						var dr = MessageBox.Show("This file already exists. Do you want extraction to proceed overwriting files, or cancel the entire operation immediately?", "File already exists", MessageBoxButtons.OKCancel);
-						if (dr == DialogResult.Cancel)
-						{
+						case true: // "Yes" -- overwrite
+							File.Delete(mp3Path);
+							break;
+						case false: // "No" -- skip
+							return;
+						case null: // "Cancel" -- halt
 							shouldHalt = true;
 							return;
-						}
-						overwriteExisting = true;
 					}
-
-					File.Delete(mp3Path);
 				}
 
 				string tempfile = Path.GetTempFileName();
diff --git a/src/BizHawk.Client.DiscoHawk/MainDiscoForm.cs b/src/BizHawk.Client.DiscoHawk/MainDiscoForm.cs
index f17b2a71bb..0e3c50e9ea 100644
--- a/src/BizHawk.Client.DiscoHawk/MainDiscoForm.cs
+++ b/src/BizHawk.Client.DiscoHawk/MainDiscoForm.cs
@@ -122,7 +122,17 @@ namespace BizHawk.Client.DiscoHawk
 				using var disc = Disc.LoadAutomagic(file);
 				var path = Path.GetDirectoryName(file);
 				var filename = Path.GetFileNameWithoutExtension(file);
-				AudioExtractor.Extract(disc, path, filename);
+				static bool? PromptForOverwrite()
+					=> MessageBox.Show(
+						"Do you want to overwrite existing files? Choosing \"No\" will simply skip those. You could also \"Cancel\" the extraction entirely.",
+						"File to extract already exists",
+						MessageBoxButtons.YesNoCancel) switch
+					{
+						DialogResult.Yes => true,
+						DialogResult.No => false,
+						_ => null
+					};
+				AudioExtractor.Extract(disc, path, filename, PromptForOverwrite);
 			}
 		}