diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index 3eb77bc192..8941c614ea 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -51,9 +51,6 @@ static int glui_entry_iterate(unsigned action)
 
    menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL);
 
-   if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
-      driver.menu_ctx->set_texture(driver.menu);
-
    if (cbs && cbs->action_iterate)
       return cbs->action_iterate(label, action);
    
diff --git a/menu/drivers/ios.c b/menu/drivers/ios.c
index 6df78ff90a..8136177512 100644
--- a/menu/drivers/ios.c
+++ b/menu/drivers/ios.c
@@ -48,9 +48,6 @@ static int ios_entry_iterate(unsigned action)
 
    menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL);
 
-   if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
-      driver.menu_ctx->set_texture(driver.menu);
-
    if (cbs && cbs->action_iterate)
       return cbs->action_iterate(label, action);
    
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 6f53ea0fd1..e2d71ccba9 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -49,15 +49,10 @@ static int rgui_entry_iterate(unsigned action)
 
    menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL);
 
-   if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
-      driver.menu_ctx->set_texture(driver.menu);
+   if (cbs && cbs->action_iterate)
+      return cbs->action_iterate(label, action);
 
-   if (!cbs)
-      return -1;
-   if (!cbs->action_iterate)
-      return -1;
-
-   return cbs->action_iterate(label, action);
+   return -1;
 }
 
 static void rgui_copy_glyph(uint8_t *glyph, const uint8_t *buf)
diff --git a/menu/drivers/rmenu.c b/menu/drivers/rmenu.c
index 4ac8d7ef86..ca15af886c 100644
--- a/menu/drivers/rmenu.c
+++ b/menu/drivers/rmenu.c
@@ -73,9 +73,6 @@ static int rmenu_entry_iterate(unsigned action)
 
    menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL);
 
-   if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
-      driver.menu_ctx->set_texture(driver.menu);
-
    if (cbs && cbs->action_iterate)
       return cbs->action_iterate(label, action);
    
diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp
index 2648523c5e..78f935788a 100644
--- a/menu/drivers/rmenu_xui.cpp
+++ b/menu/drivers/rmenu_xui.cpp
@@ -67,9 +67,6 @@ static int rmenu_xui_entry_iterate(unsigned action)
 
    menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL);
 
-   if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
-      driver.menu_ctx->set_texture(driver.menu);
-
    if (cbs && cbs->action_iterate)
       return cbs->action_iterate(label, action);
    
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 1315c78ebe..6162180895 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -170,9 +170,6 @@ static int xmb_entry_iterate(unsigned action)
 
    menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL);
 
-   if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
-      driver.menu_ctx->set_texture(driver.menu);
-
    if (cbs && cbs->action_iterate)
       return cbs->action_iterate(label, action);
    
diff --git a/menu/menu.c b/menu/menu.c
index 35f569e20c..e724e87039 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -355,6 +355,9 @@ int menu_iterate(retro_input_t input,
    int32_t ret     = 0;
    unsigned action = menu_input_frame(input, trigger_input);
 
+   if (driver.menu_ctx && driver.menu_ctx->set_texture)
+      driver.menu_ctx->set_texture(driver.menu);
+
    if (driver.menu_ctx && driver.menu_ctx->entry_iterate) 
       ret = driver.menu_ctx->entry_iterate(action);