diff --git a/command_event.c b/command_event.c
index 0d16ab7888..1b9374002f 100644
--- a/command_event.c
+++ b/command_event.c
@@ -547,6 +547,7 @@ static void event_deinit_core(bool reinit)
    if(settings->sort_savestates_enable)
       strlcpy(global->savestate_dir,orig_savestate_dir,sizeof(global->savestate_dir));
 
+  /* restore system directory if it was set to <content dir> */
   if(orig_system_dir_empty)
       strlcpy(settings->system_directory,"",sizeof(settings->system_directory));
   
diff --git a/frontend/frontend.c b/frontend/frontend.c
index 3113482408..09704c8ef0 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -47,6 +47,10 @@ void main_exit_save_config(void)
       if (settings->sort_savestates_enable && orig_savestate_dir[0] != '\0')
          strlcpy(global->savestate_dir,orig_savestate_dir,sizeof(global->savestate_dir));
 
+      /* restore system directory if it was set to <content dir> */
+      if(orig_system_dir_empty)
+         strlcpy(settings->system_directory,"",sizeof(settings->system_directory));
+
       /* Save last core-specific config to the default config location,
        * needed on consoles for core switching and reusing last good 
        * config for new cores.