diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 2c5c2fe770..3c9793b689 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -3151,9 +3151,9 @@ static void gl_set_osd_msg(void *data, const char *msg,
 
    if (driver->font_osd_driver && font)
    {
-      context_bind_hw_render(gl, false);
+      /* context_bind_hw_render(gl, false); */
       font_driver->render_msg(font, msg, params);
-      context_bind_hw_render(gl, true);
+      /* context_bind_hw_render(gl, true); */
    }
 }
 
diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index 694aa66a2f..99b50bdc70 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -107,7 +107,6 @@ static void glui_blit_line(float x, float y,
 static void glui_render_quad(gl_t *gl, int x, int y, int w, int h,
       float r, float g, float b, float a)
 {
-
    struct gl_coords coords;
    menu_handle_t *menu = menu_driver_get_ptr();
    glui_handle_t *glui = (glui_handle_t*)menu->userdata;
@@ -366,7 +365,8 @@ static void glui_frame(void)
 
    if (menu->need_refresh
          && runloop->is_menu
-         && !menu->msg_force)
+         && !menu->msg_force
+         && !glui->box_message[0])
       return;
 
    menu_display_set_viewport(menu);