diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c
index 6fec0ce006..c9bb8e889b 100644
--- a/gfx/drivers_font/gl_raster_font.c
+++ b/gfx/drivers_font/gl_raster_font.c
@@ -322,7 +322,7 @@ static void gl_raster_font_render_msg(void *data, const char *msg,
    }
 
    if (font->block)
-      font->block->fullscreen = true;
+      font->block->fullscreen = full_screen;
    else
       setup_viewport(font, full_screen);
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 982f09edea..43cbe0637b 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1267,7 +1267,9 @@ static void xmb_frame(void)
       return;
 
    if (gl->font_driver->bind_block)
-      gl->font_driver->bind_block(gl->font_handle, &xmb->raster_block);
+      gl->font_driver->bind_block(xmb->font.buf, &xmb->raster_block);
+
+   xmb->raster_block.carr.coords.vertices = 0;
 
    xmb_frame_background(settings, gl, xmb, false);
 
@@ -1385,8 +1387,8 @@ static void xmb_frame(void)
 
    if (gl->font_driver->flush)
    {
-      gl->font_driver->flush(gl->font_handle);
-      gl->font_driver->bind_block(gl->font_handle, NULL);
+      gl->font_driver->flush(xmb->font.buf);
+      gl->font_driver->bind_block(xmb->font.buf, NULL);
    }
 
    if (settings->menu.mouse.enable)