diff --git a/default.nix b/default.nix
index f05800f5c2..f388b2cba9 100644
--- a/default.nix
+++ b/default.nix
@@ -88,7 +88,7 @@ let
 			${commentUnless useCWDAsSource}dotnet build ${extraDotnetBuildFlags}
 			${commentUnless useCWDAsSource}cd ../..
 			Dist/Build${buildConfig}.sh ${extraDotnetBuildFlags}
-			printf "Nix" >output/dll/custombuild.txt
+			printf "NixHawk" >output/dll/custombuild.txt
 			Dist/Package.sh linux-x64
 		'';
 		inherit doCheck;
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index efd6ed7283..d9fa70571c 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -1681,27 +1681,20 @@ namespace BizHawk.Client.EmuHawk
 					sb.Append($"({_lastFps:0} fps) - ");
 				}
 
-				if (!string.IsNullOrEmpty(VersionInfo.CustomBuildString))
-				{
-					sb.Append($"{VersionInfo.CustomBuildString} ");
-				}
-
-				sb.Append(Emulator.IsNull() ? "BizHawk" : Emulator.GetSystemDisplayName());
-
-				if (VersionInfo.DeveloperBuild)
-				{
-					sb.Append(" (interim)");
-				}
-
 				if (!Emulator.IsNull())
 				{
-					sb.Append($" - {Game.Name}");
+					sb.Append($"{Game.Name} {Emulator.GetSystemDisplayName()} - ");
 					if (MovieSession.Movie.IsActive())
 					{
-						sb.Append($" - {Path.GetFileName(MovieSession.Movie.Filename)}");
+						sb.Append($"{Path.GetFileName(MovieSession.Movie.Filename)} - ");
 					}
 				}
 
+				sb.Append(string.IsNullOrEmpty(VersionInfo.CustomBuildString)
+					? "BizHawk"
+					: VersionInfo.CustomBuildString);
+				if (VersionInfo.DeveloperBuild) sb.Append(" (interim)");
+
 				return sb.ToString();
 			}
 		}
@@ -1711,8 +1704,9 @@ namespace BizHawk.Client.EmuHawk
 			get
 			{
 				var sb = new StringBuilder();
-				if (!string.IsNullOrEmpty(VersionInfo.CustomBuildString)) sb.Append($"{VersionInfo.CustomBuildString} ");
-				sb.Append("BizHawk");
+				sb.Append(string.IsNullOrEmpty(VersionInfo.CustomBuildString)
+					? "BizHawk"
+					: VersionInfo.CustomBuildString);
 				if (VersionInfo.DeveloperBuild) sb.Append(" (interim)");
 				return sb.ToString();
 			}