diff --git a/driver.h b/driver.h
index 72050f441c..d42eb62d0c 100644
--- a/driver.h
+++ b/driver.h
@@ -253,9 +253,6 @@ typedef struct driver
 #ifdef HAVE_NETWORK_GAMEPAD
    rarch_remote_t *remote;
 #endif
-
-   /* Last message given to the video driver */
-   char current_msg[PATH_MAX_LENGTH];
 } driver_t;
 
 /**
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 87715c0dcd..a0a01f3287 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -75,6 +75,9 @@ typedef struct video_pixel_scaler
    void *scaler_out;
 } video_pixel_scaler_t;
 
+/* Last message given to the video driver */
+static char current_msg[PATH_MAX_LENGTH];
+
 /* If set during context deinit, the driver should keep
  * graphics context alive to avoid having to reset all 
  * context state. */
@@ -1848,16 +1851,16 @@ void video_frame(const void *data, unsigned width,
 
    msg                = rarch_main_msg_queue_pull();
 
-   *driver->current_msg = 0;
+   *current_msg = 0;
 
    if (msg)
-      strlcpy(driver->current_msg, msg, sizeof(driver->current_msg));
+      strlcpy(current_msg, msg, sizeof(current_msg));
 
    video_driver_ctl(RARCH_DISPLAY_CTL_GET_FRAME_COUNT, &frame_count);
 
    if (!current_video->frame(
             video_data, data, width, height, *frame_count,
-            pitch, driver->current_msg))
+            pitch, current_msg))
       driver->video_active = false;
 
    *frame_count = *frame_count + 1;
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 0fd33126e9..9e73a984e4 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -611,22 +611,6 @@ static void rgui_render(void)
             entry_selected ? hover_color : normal_color);
    }
 
-#ifdef GEKKO
-   const char *message_queue;
-
-   if (msg_force)
-   {
-      msg_force     = false;
-      message_queue = rarch_main_msg_queue_pull();
-
-      menu_display_ctl(MENU_DISPLAY_CTL_SET_MSG_FORCE, &msg_force);
-   }
-   else
-      message_queue = driver->current_msg;
-
-   rgui_render_messagebox( message_queue);
-#endif
-
    menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_DISPLAY, &display_kb);
 
    if (display_kb)