diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index 4741276848..1cf7d29117 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -419,9 +419,6 @@ int menu_entry_select(uint32_t i)
    if (action != MENU_ACTION_NOOP)
        ret = menu_entry_action(&entry, i, action);
     
-   if (menu_needs_refresh())
-       menu_do_refresh(action);
-    
    return ret;
 }
 
diff --git a/runloop_data.c b/runloop_data.c
index 2c6faa507c..16cfc03836 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -273,7 +273,8 @@ void rarch_main_data_iterate(void)
    }
 
 #ifdef HAVE_MENU
-   menu_do_refresh(MENU_ACTION_REFRESH);
+   if (menu_needs_refresh())
+      menu_do_refresh(MENU_ACTION_REFRESH);
 #endif
 
 #ifdef HAVE_THREADS