diff --git a/source/ngc/filebrowser.cpp b/source/ngc/filebrowser.cpp
index 0ecaf62..f21c93c 100644
--- a/source/ngc/filebrowser.cpp
+++ b/source/ngc/filebrowser.cpp
@@ -268,14 +268,14 @@ bool MakeFilePath(char filepath[], int type, char * filename, int filenum)
 	}
 	else
 	{
+		if(GCSettings.SaveMethod == DEVICE_AUTO)
+			GCSettings.SaveMethod = autoSaveMethod(SILENT);
+
+		if(GCSettings.SaveMethod == DEVICE_AUTO)
+			return false;
+
 		switch(type)
 		{
-			if(GCSettings.SaveMethod == DEVICE_AUTO)
-				GCSettings.SaveMethod = autoSaveMethod(SILENT);
-			
-			if(GCSettings.SaveMethod == DEVICE_AUTO)
-				return false;
-			
 			case FILE_SRAM:
 			case FILE_SNAPSHOT:
 				sprintf(folder, GCSettings.SaveFolder);