diff --git a/readme.txt b/readme.txt
index ebfba1b..e9870ae 100644
--- a/readme.txt
+++ b/readme.txt
@@ -10,7 +10,7 @@
 ญ————————————————————————————————————————————————————————————————————————————
 
 ื—–ญ—–ญ—–ญ—–ญ –ญ—–ญ—–ญ—–ญ—–ญ—–ญ—–ญ—–ญ—–ญ—–ญ— ญ—–ญ—–ญ—–ญ—–ญ—–ญ—–ญ—–ญ—-ญ—–ญ-–•ฌ
-|0Oื๘oท                      Snes9x GX 4.1.7                          ทo๘ืO0|
+|0Oื๘oท                      Snes9x GX 4.1.8                          ทo๘ืO0|
 |                   http://code.google.com/p/snes9x-gx                      |
 |                          (Under GPL License)                              |
 `จ•จจจจจ จจจจจจจจจจจจจจจจ จจจจจจจจจจจจจจจ จจจจจจจจจจจจจจจจจจจจ จจจจจจจจจจจจจ'
@@ -43,6 +43,10 @@ Wii homebrew is WiiBrew (www.wiibrew.org).
 |                                                          UPDATE HISTORY  |
 •˜———–—––-- - —————————––––– ———–—––-- - —————————––––– ———–—––-- - ————————•
 
+[4.1.8 - April 9, 2010]
+
+* Fix auto-save bug
+
 [4.1.7 - April 9, 2010]
 
 * Freezing issue fixed
diff --git a/source/filebrowser.cpp b/source/filebrowser.cpp
index d58a598..6508b71 100644
--- a/source/filebrowser.cpp
+++ b/source/filebrowser.cpp
@@ -516,6 +516,10 @@ int BrowserLoadFile()
 	if(!IsValidROM())
 		goto done;
 
+	// store the filename (w/o ext) - used for sram/freeze naming
+	StripExt(Memory.ROMFilename, browserList[browser.selIndex].filename);
+	strcpy(loadedFile, browserList[browser.selIndex].filename);
+
 	SNESROMSize = 0;
 	S9xDeleteCheats();
 	Memory.LoadROM("ROM");
@@ -532,9 +536,6 @@ int BrowserLoadFile()
 		else if (GCSettings.AutoLoad == 2)
 			LoadSnapshotAuto(SILENT);
 
-		// store the filename (w/o ext) - used for sram/freeze naming
-		StripExt(Memory.ROMFilename, browserList[browser.selIndex].filename);
-		strcpy(loadedFile, browserList[browser.selIndex].filename);
 		ResetBrowser();
 		loaded = 1;
 	}
diff --git a/source/snes9xgx.h b/source/snes9xgx.h
index 8c9eae6..0fb9e75 100644
--- a/source/snes9xgx.h
+++ b/source/snes9xgx.h
@@ -20,7 +20,7 @@
 #include "filelist.h"
 
 #define APPNAME 		"Snes9x GX"
-#define APPVERSION 		"4.1.7"
+#define APPVERSION 		"4.1.8"
 #define APPFOLDER 		"snes9xgx"
 #define PREF_FILE_NAME 	"settings.xml"
 
diff --git a/update.xml b/update.xml
index d7ed267..b282312 100644
--- a/update.xml
+++ b/update.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<app version="4.1.7">
-<file url="http://snes9x-gx.googlecode.com/files/Snes9x%20GX%204.1.7.zip"></file>
+<app version="4.1.8">
+<file url="http://snes9x-gx.googlecode.com/files/Snes9x%20GX%204.1.8.zip"></file>
 </app>