diff --git a/frontend/menu/disp/rmenu.c b/frontend/menu/disp/rmenu.c
index 38d8c4a306..ba8f692ff4 100644
--- a/frontend/menu/disp/rmenu.c
+++ b/frontend/menu/disp/rmenu.c
@@ -488,7 +488,6 @@ const menu_ctx_driver_t menu_ctx_rmenu = {
    NULL,
    NULL,
    NULL,
-   NULL,
    &menu_ctx_backend_common,
    "rmenu",
 };
diff --git a/frontend/menu/menu_settings.c b/frontend/menu/menu_settings.c
index 25378e8e3a..9547064f95 100644
--- a/frontend/menu/menu_settings.c
+++ b/frontend/menu/menu_settings.c
@@ -1414,10 +1414,10 @@ int menu_set_settings(void *data, unsigned setting, unsigned action)
 
             if (driver.video && driver.video->restart)
                driver.video->restart();
-            if (menu_ctx && menu_ctx->free_assets)
-               menu_ctx->free_assets(rgui);
-            if (menu_ctx && menu_ctx->init_assets)
-               menu_ctx->init_assets(rgui);
+            if (driver.menu_ctx && driver.menu_ctx->free_assets)
+               driver.menu_ctx->free_assets(rgui);
+            if (driver.menu_ctx && driver.menu_ctx->init_assets)
+               driver.menu_ctx->init_assets(rgui);
          }
          break;
       case RGUI_SETTINGS_VIDEO_PAL60:
@@ -1435,10 +1435,10 @@ int menu_set_settings(void *data, unsigned setting, unsigned action)
 
                   if (driver.video && driver.video->restart)
                      driver.video->restart();
-                  if (menu_ctx && menu_ctx->free_assets)
-                     menu_ctx->free_assets(rgui);
-                  if (menu_ctx && menu_ctx->init_assets)
-                     menu_ctx->init_assets(rgui);
+                  if (driver.menu_ctx && driver.menu_ctx->free_assets)
+                     driver.menu_ctx->free_assets(rgui);
+                  if (driver.menu_ctx && driver.menu_ctx->init_assets)
+                     driver.menu_ctx->init_assets(rgui);
                }
                break;
             case RGUI_ACTION_START:
@@ -1448,10 +1448,10 @@ int menu_set_settings(void *data, unsigned setting, unsigned action)
 
                   if (driver.video && driver.video->restart)
                      driver.video->restart();
-                  if (menu_ctx && menu_ctx->free_assets)
-                     menu_ctx->free_assets(rgui);
-                  if (menu_ctx && menu_ctx->init_assets)
-                     menu_ctx->init_assets(rgui);
+                  if (driver.menu_ctx && driver.menu_ctx->free_assets)
+                     driver.menu_ctx->free_assets(rgui);
+                  if (driver.menu_ctx && driver.menu_ctx->init_assets)
+                     driver.menu_ctx->init_assets(rgui);
                }
                break;
          }