diff --git a/source/filebrowser.cpp b/source/filebrowser.cpp
index 2e04afc..69cada6 100644
--- a/source/filebrowser.cpp
+++ b/source/filebrowser.cpp
@@ -482,11 +482,6 @@ int BrowserLoadFile()
 	if(!IsValidROM())
 		goto done;
 
-	strcpy(loadedFile, browserList[browser.selIndex].filename);
-
-	// store the filename (w/o ext) - used for ram/state naming
-	StripExt(romFilename, browserList[browser.selIndex].filename);
-	
 	loadingFile = true;
 
 	if(!inSz)
@@ -529,6 +524,11 @@ int BrowserLoadFile()
 				LoadStateAuto(SILENT);
 
 			ResetNES();
+
+			// store the filename (w/o ext) - used for ram/state naming
+			StripExt(romFilename, browserList[browser.selIndex].filename);
+			strcpy(loadedFile, browserList[browser.selIndex].filename);
+
 			ResetBrowser();
 		}
 	}