diff --git a/shell/android/res/values/strings.xml b/shell/android/res/values/strings.xml
index 3a5fa4960..da7bdeef6 100644
--- a/shell/android/res/values/strings.xml
+++ b/shell/android/res/values/strings.xml
@@ -99,7 +99,7 @@
     <string name="textOff">OFF</string>
     
     <string name="platform">Copying logcat content to clipboard\nPlease paste in the issue report</string>
-    <string name="bios_config">Please generate a config\n(Run BIOS at least once)</string>
+    <string name="bios_config">Configuration failed!</string>
     <string name="menu_debug">Submit Error Logs</string>
 
 </resources>
diff --git a/shell/android/src/com/reicast/emulator/ConfigureFragment.java b/shell/android/src/com/reicast/emulator/ConfigureFragment.java
index 7dfe43061..f843b48e4 100644
--- a/shell/android/src/com/reicast/emulator/ConfigureFragment.java
+++ b/shell/android/src/com/reicast/emulator/ConfigureFragment.java
@@ -432,11 +432,13 @@ public class ConfigureFragment extends Fragment {
 
 	public void executeAppendConfig(String identifier, String value) {
 		File config = new File(home_directory, "emu.cfg");
+		File modified = new File(home_directory, "emu.cfg.bak");
 		try {
 			if (config.exists()) {
+				config.renameTo(modified);
 				// Read existing emu.cfg and substitute new setting value
 				StringBuilder rebuildFile = new StringBuilder();
-				Scanner scanner = new Scanner(config);
+				Scanner scanner = new Scanner(modified);
 				String currentLine;
 				while (scanner.hasNextLine()) {
 					currentLine = scanner.nextLine();
@@ -447,11 +449,18 @@ public class ConfigureFragment extends Fragment {
 					}
 				}
 				scanner.close();
-				config.delete();
 				FileOutputStream fos = new FileOutputStream(config);
 				fos.write(rebuildFile.toString().getBytes());
 				fos.close();
-			} else if (config.createNewFile()) {
+				if (config.exists()) {
+					modified.delete();
+				} else {
+					Toast.makeText(parentActivity,
+							parentActivity.getString(R.string.bios_config),
+							Toast.LENGTH_SHORT).show();
+					modified.renameTo(config);
+				}
+			} else {
 				StringBuilder rebuildFile = new StringBuilder();
 				rebuildFile.append("[config]" + "\n");
 				rebuildFile.append("Dynarec.Enabled="
@@ -481,13 +490,17 @@ public class ConfigureFragment extends Fragment {
 				FileOutputStream fos = new FileOutputStream(config);
 				fos.write(rebuildFile.toString().getBytes());
 				fos.close();
-			} else {
-				Toast.makeText(parentActivity,
-						parentActivity.getString(R.string.bios_config),
-						Toast.LENGTH_SHORT).show();
+				if (!config.exists()) {
+					Toast.makeText(parentActivity,
+							parentActivity.getString(R.string.bios_config),
+							Toast.LENGTH_SHORT).show();
+				}
 			}
 		} catch (Exception e) {
 			Log.d("reicast", "Exception: " + e);
+			Toast.makeText(parentActivity,
+					parentActivity.getString(R.string.bios_config),
+					Toast.LENGTH_SHORT).show();
 		}
 	}
 }