diff --git a/menu/menu.c b/menu/menu.c
index 2e9f868ce6..b1e7454078 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -297,9 +297,6 @@ int menu_iterate(retro_input_t input,
 
    action = menu->input.joypad;
 
-   if (menu_do_refresh(action) == 0)
-      return 0;
-
    ret = menu_entry_iterate(action);
 
    if (runloop->is_menu && !runloop->is_idle)
diff --git a/runloop_data.c b/runloop_data.c
index df2884e8ad..2c6faa507c 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -22,6 +22,10 @@
 #include <rthreads/rthreads.h>
 #endif
 
+#ifdef HAVE_MENU
+#include "menu/menu.h"
+#endif
+
 enum
 {
    THREAD_CODE_INIT = 0,
@@ -268,6 +272,10 @@ void rarch_main_data_iterate(void)
       data_runloop_msg[0] = '\0';
    }
 
+#ifdef HAVE_MENU
+   menu_do_refresh(MENU_ACTION_REFRESH);
+#endif
+
 #ifdef HAVE_THREADS
    if (settings->menu.threaded_data_runloop_enable && runloop->alive)
       return;