diff --git a/frontend/frontend.c b/frontend/frontend.c
index 57af1cce25..245031511f 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -99,14 +99,8 @@ int main(int argc, char *argv[])
 
    menu_free();
 
-   // TODO: Commented for now since this conflicts with Phoenix config saving.
-   // Either Phoenix frontend needs to have the same amount of options as RGUI
-   // or we should slim down Phoenix even more (in terms of taking away the options)
-   // and do that with RGUI so that we can uncomment that without Phoenix modifying
-   // the config file on its own based on user preferences.
-
-   //if (g_extern.config_save_on_exit)
-      //config_save_file(g_extern.config_path);
+   if (g_extern.config_save_on_exit)
+      config_save_file(g_extern.config_path);
 
    if (g_extern.main_is_init)
       rarch_main_deinit();
diff --git a/retroarch.cfg b/retroarch.cfg
index 6e6d1c9214..46b14c9542 100644
--- a/retroarch.cfg
+++ b/retroarch.cfg
@@ -34,6 +34,10 @@
 # Sets start directory for RGUI ROM browser.
 # rgui_browser_directory =
 
+# Flushes config to disk on exit. Useful for RGUI as settings can be modified.
+# Overwrites the config. #include's and comments are not preserved.
+# config_save_on_exit = false
+
 #### Video
 
 # Video driver to use. "gl", "xvideo", "sdl"