diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 56a8c4c7..1e4335dd 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -308,17 +308,15 @@ namespace DICUI
             var driveTuple = cmb_DriveLetter.SelectedItem as Tuple<char, string>;
             var discTuple = cmb_DiscType.SelectedItem as Tuple<string, KnownSystem?, DiscType?>;
 
-            if (driveTuple != null)
+            if (driveTuple != null && discTuple != null)
             {
-                if (String.IsNullOrWhiteSpace(txt_OutputDirectory.Text))
-                {
-                    txt_OutputDirectory.Text = defaultOutputPath;
-                }
-
-                if (discTuple != null)
-                {
-                    txt_OutputFilename.Text = driveTuple.Item2 + Utilities.GetDefaultExtension(discTuple.Item3);
-                }
+                txt_OutputDirectory.Text = Path.Combine(defaultOutputPath, driveTuple.Item2);
+                txt_OutputFilename.Text = driveTuple.Item2 + Utilities.GetDefaultExtension(discTuple.Item3);
+            }
+            else
+            {
+                txt_OutputDirectory.Text = defaultOutputPath;
+                txt_OutputFilename.Text = "disc.bin";
             }
         }
 
diff --git a/Utilities.cs b/Utilities.cs
index de2a523c..41d0eefc 100644
--- a/Utilities.cs
+++ b/Utilities.cs
@@ -1236,10 +1236,9 @@ namespace DICUI
             outputFilename = Path.GetFileNameWithoutExtension(outputFilename);
 
             // Now write out to a generic file
-            string combinedBase = Path.Combine(outputDirectory, outputFilename);
             try
             {
-                using (StreamWriter sw = new StreamWriter(File.Open(combinedBase + "_submissionInfo.txt", FileMode.Create, FileAccess.Write)))
+                using (StreamWriter sw = new StreamWriter(File.Open(Path.Combine(outputDirectory, "!submissionInfo.txt"), FileMode.Create, FileAccess.Write)))
                 {
                     foreach (string line in lines)
                     {