diff --git a/general.h b/general.h
index ba48ca3a32..f02c8a4aad 100644
--- a/general.h
+++ b/general.h
@@ -110,7 +110,6 @@ enum basic_event
    RARCH_CMD_AUDIO_START,
    RARCH_CMD_OVERLAY_INIT,
    RARCH_CMD_OVERLAY_DEINIT,
-   RARCH_CMD_OVERLAY_REINIT,
    RARCH_CMD_OVERLAY_SET_SCALE_FACTOR,
    RARCH_CMD_OVERLAY_SET_ALPHA_MOD,
    RARCH_CMD_DSP_FILTER_INIT,
diff --git a/retroarch.c b/retroarch.c
index e4547133e6..88dc25f702 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2302,6 +2302,7 @@ bool rarch_main_command(unsigned cmd)
 #endif
          break;
       case RARCH_CMD_OVERLAY_INIT:
+         rarch_main_command(RARCH_CMD_OVERLAY_DEINIT);
 #ifdef HAVE_OVERLAY
          if (!*g_settings.input.overlay)
             break;
@@ -2311,10 +2312,6 @@ bool rarch_main_command(unsigned cmd)
             RARCH_ERR("Failed to load overlay.\n");
 #endif
          break;
-      case RARCH_CMD_OVERLAY_REINIT:
-         rarch_main_command(RARCH_CMD_OVERLAY_DEINIT);
-         rarch_main_command(RARCH_CMD_OVERLAY_INIT);
-         break;
       case RARCH_CMD_DSP_FILTER_DEINIT:
          if (g_extern.audio_data.dsp)
             rarch_dsp_filter_free(g_extern.audio_data.dsp);
diff --git a/settings_data.c b/settings_data.c
index 81f8b64084..17af206f3b 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -2540,7 +2540,7 @@ rarch_setting_t *setting_data_get_list(void)
 #ifdef HAVE_OVERLAY
       START_GROUP("Overlay Options")
       START_SUB_GROUP("State", GROUP_NAME)
-      CONFIG_PATH(g_settings.input.overlay,              "input_overlay",              "Overlay Preset",              g_extern.overlay_dir, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY) WITH_VALUES("cfg") WITH_CMD(RARCH_CMD_OVERLAY_REINIT)
+      CONFIG_PATH(g_settings.input.overlay,              "input_overlay",              "Overlay Preset",              g_extern.overlay_dir, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY) WITH_VALUES("cfg") WITH_CMD(RARCH_CMD_OVERLAY_INIT)
       CONFIG_FLOAT(g_settings.input.overlay_opacity,     "input_overlay_opacity",      "Overlay Opacity",            0.7f, "%.2f", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_RANGE(0, 1, 0.01, true, true) WITH_CMD(RARCH_CMD_OVERLAY_SET_ALPHA_MOD) WITH_FLAGS(SD_FLAG_CMD_APPLY_AUTO)
       CONFIG_FLOAT(g_settings.input.overlay_scale,       "input_overlay_scale",        "Overlay Scale",              1.0f, "%.2f", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_RANGE(0, 2, 0.01, true, true) WITH_CMD(RARCH_CMD_OVERLAY_SET_SCALE_FACTOR) WITH_FLAGS(SD_FLAG_CMD_APPLY_AUTO)
       END_SUB_GROUP()