diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs
index cc977ef0a4..677f153f25 100644
--- a/BizHawk.Client.Common/RomLoader.cs
+++ b/BizHawk.Client.Common/RomLoader.cs
@@ -652,13 +652,16 @@ namespace BizHawk.Client.Common
 						rom = new RomGame(file);
 						game = rom.GameInfo;
 					}
-					else if(ext != null) // most extensions
+					else if (ext != null) // most extensions
 					{
 						rom = new RomGame(file);
 
 						//hacky for now
 						if (file.Extension.ToLowerInvariant() == ".exe")
 							rom.GameInfo.System = "PSX";
+						else if (file.Extension.ToLowerInvariant() == ".nsf")
+							rom.GameInfo.System = "NES";
+
 
 						if (string.IsNullOrEmpty(rom.GameInfo.System))
 						{