diff --git a/command.c b/command.c
index 6d956bf57b..1b92e8a417 100644
--- a/command.c
+++ b/command.c
@@ -1935,7 +1935,9 @@ bool command_event(enum event_command cmd, void *data)
          {
             case CMD_EVENT_QUIT:
                runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL);
+#ifdef HAVE_MENU
                rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
+#endif
                break;
             default:
                break;
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 0a9d2f4da8..bb29142850 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1835,6 +1835,12 @@ bool task_push_content_load_default(
       case CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU:
          if (!command_event_cmd_exec((void*)fullpath))
             return false;
+#ifndef HAVE_DYNAMIC
+         runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL);
+#ifdef HAVE_MENU
+         rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
+#endif
+#endif
          break;
       default:
          break;