diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index 1f3aebbaa7..eaf1efefa6 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -159,7 +159,7 @@ void vulkan_copy_staging_to_dynamic(vk_t *vk, VkCommandBuffer cmd,
    retro_assert(staging->type == VULKAN_TEXTURE_STAGING);
 
    vulkan_sync_texture_to_gpu(vk, staging);
-   vulkan_transition_texture(vk, staging);
+   vulkan_transition_texture(vk, cmd, staging);
 
    /* We don't have to sync against previous TRANSFER, 
     * since we observed the completion by fences. 
@@ -170,7 +170,7 @@ void vulkan_copy_staging_to_dynamic(vk_t *vk, VkCommandBuffer cmd,
     * We would also need to optionally maintain extra textures due to 
     * changes in resolution, so this seems like the sanest and 
     * simplest solution. */
-   vulkan_image_layout_transition(vk, vk->cmd, dynamic->image,
+   vulkan_image_layout_transition(vk, cmd, dynamic->image,
          VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
          0, VK_ACCESS_TRANSFER_WRITE_BIT,
          VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
@@ -184,12 +184,12 @@ void vulkan_copy_staging_to_dynamic(vk_t *vk, VkCommandBuffer cmd,
    region.srcSubresource.layerCount = 1;
    region.dstSubresource = region.srcSubresource;
 
-   vkCmdCopyImage(vk->cmd,
+   vkCmdCopyImage(cmd,
          staging->image, VK_IMAGE_LAYOUT_GENERAL,
          dynamic->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
          1, &region);
 
-   vulkan_image_layout_transition(vk, vk->cmd,
+   vulkan_image_layout_transition(vk, cmd,
          dynamic->image,
          VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
          VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
@@ -729,7 +729,7 @@ static void vulkan_write_quad_descriptors(
    }
 }
 
-void vulkan_transition_texture(vk_t *vk, struct vk_texture *texture)
+void vulkan_transition_texture(vk_t *vk, VkCommandBuffer cmd, struct vk_texture *texture)
 {
    /* Transition to GENERAL layout for linear streamed textures.
     * We're using linear textures here, so only 
@@ -744,7 +744,7 @@ void vulkan_transition_texture(vk_t *vk, struct vk_texture *texture)
    switch (texture->type)
    {
       case VULKAN_TEXTURE_STREAMED:
-         vulkan_image_layout_transition(vk, vk->cmd, texture->image,
+         vulkan_image_layout_transition(vk, cmd, texture->image,
                texture->layout, VK_IMAGE_LAYOUT_GENERAL,
                VK_ACCESS_HOST_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT,
                VK_PIPELINE_STAGE_HOST_BIT,
@@ -752,7 +752,7 @@ void vulkan_transition_texture(vk_t *vk, struct vk_texture *texture)
          break;
 
       case VULKAN_TEXTURE_STAGING:
-         vulkan_image_layout_transition(vk, vk->cmd, texture->image,
+         vulkan_image_layout_transition(vk, cmd, texture->image,
                texture->layout, VK_IMAGE_LAYOUT_GENERAL,
                VK_ACCESS_HOST_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT,
                VK_PIPELINE_STAGE_HOST_BIT,
@@ -786,7 +786,7 @@ static void vulkan_check_dynamic_state(
 void vulkan_draw_triangles(vk_t *vk, const struct vk_draw_triangles *call)
 {
    if (call->texture)
-      vulkan_transition_texture(vk, call->texture);
+      vulkan_transition_texture(vk, vk->cmd, call->texture);
 
    if (call->pipeline != vk->tracker.pipeline)
    {
@@ -844,7 +844,7 @@ void vulkan_draw_triangles(vk_t *vk, const struct vk_draw_triangles *call)
 
 void vulkan_draw_quad(vk_t *vk, const struct vk_draw_quad *quad)
 {
-   vulkan_transition_texture(vk, quad->texture);
+   vulkan_transition_texture(vk, vk->cmd, quad->texture);
 
    if (quad->pipeline != vk->tracker.pipeline)
    {
diff --git a/gfx/common/vulkan_common.h b/gfx/common/vulkan_common.h
index 69298845c5..519570de34 100644
--- a/gfx/common/vulkan_common.h
+++ b/gfx/common/vulkan_common.h
@@ -413,7 +413,7 @@ struct vk_texture vulkan_create_texture(vk_t *vk,
 void vulkan_sync_texture_to_gpu(vk_t *vk, const struct vk_texture *tex);
 void vulkan_sync_texture_to_cpu(vk_t *vk, const struct vk_texture *tex);
 
-void vulkan_transition_texture(vk_t *vk, struct vk_texture *texture);
+void vulkan_transition_texture(vk_t *vk, VkCommandBuffer cmd, struct vk_texture *texture);
 
 void vulkan_transfer_image_ownership(VkCommandBuffer cmd,
       VkImage image, VkImageLayout layout,
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index 8d8e142d61..29b806cbbc 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -1714,7 +1714,7 @@ static bool vulkan_frame(void *data, const void *frame,
          if (vk->swapchain[vk->last_valid_index].texture_optimal.memory != VK_NULL_HANDLE)
             tex = &vk->swapchain[vk->last_valid_index].texture_optimal;
          else
-            vulkan_transition_texture(vk, tex);
+            vulkan_transition_texture(vk, vk->cmd, tex);
 
          input.image  = tex->image;
          input.view   = tex->view;
diff --git a/gfx/drivers_font/vulkan_raster_font.c b/gfx/drivers_font/vulkan_raster_font.c
index 247db0c91f..c1036d217d 100644
--- a/gfx/drivers_font/vulkan_raster_font.c
+++ b/gfx/drivers_font/vulkan_raster_font.c
@@ -30,6 +30,7 @@ typedef struct
    const font_renderer_driver_t *font_driver;
    void *font_data;
    struct font_atlas *atlas;
+   bool needs_update;
 
    struct vk_vertex *pv;
    struct vk_buffer_range range;
@@ -79,6 +80,8 @@ static void *vulkan_raster_font_init_font(void *data,
          font->atlas->width, font->atlas->height, VK_FORMAT_R8_UNORM, NULL,
          NULL /*&swizzle*/, VULKAN_TEXTURE_DYNAMIC);
 
+   font->needs_update = true;
+
    return font;
 }
 
@@ -100,6 +103,23 @@ static void vulkan_raster_font_free_font(void *data, bool is_threaded)
    free(font);
 }
 
+static INLINE void vulkan_raster_font_update_glyph(vulkan_raster_t *font, const struct font_glyph *glyph)
+{
+   if(font->atlas->dirty)
+   {
+      int row;
+      for(row = glyph->atlas_offset_y; row < (glyph->atlas_offset_y + glyph->height); row++)
+      {
+         uint8_t* src = font->atlas->buffer + row * font->atlas->width + glyph->atlas_offset_x;
+         uint8_t* dst = (uint8_t*)font->texture.mapped + row * font->texture.stride + glyph->atlas_offset_x;
+         memcpy(dst, src, glyph->width);
+      }
+
+      font->atlas->dirty = false;
+      font->needs_update = true;
+   }
+}
+
 static int vulkan_get_message_width(void *data, const char *msg,
       unsigned msg_len, float scale)
 {
@@ -118,8 +138,12 @@ static int vulkan_get_message_width(void *data, const char *msg,
       if (!glyph) /* Do something smarter here ... */
          glyph = font->font_driver->get_glyph(font->font_data, '?');
 
+
       if (glyph)
+      {
+         vulkan_raster_font_update_glyph(font, glyph);
          delta_x += glyph->advance_x;
+      }
    }
 
    return delta_x * scale;
@@ -130,7 +154,6 @@ static void vulkan_raster_font_render_line(
       float scale, const float color[4], float pos_x,
       float pos_y, unsigned text_align)
 {
-   unsigned i;
    struct vk_color vk_color;
    vk_t *vk             = font->vk;
    const char* msg_end  = msg + msg_len;
@@ -170,6 +193,8 @@ static void vulkan_raster_font_render_line(
       if (!glyph)
          continue;
 
+      vulkan_raster_font_update_glyph(font, glyph);
+
       off_x  = glyph->draw_offset_x;
       off_y  = glyph->draw_offset_y;
       tex_x  = glyph->atlas_offset_x;
@@ -256,20 +281,45 @@ static void vulkan_raster_font_flush(vulkan_raster_t *font)
       font->vertices,
    };
 
-   if(font->atlas->dirty)
+   if(font->needs_update)
    {
-      int i = 0;
-      for(i = 0; i < font->atlas->height; i++)
-      {
-         uint8_t* src = font->atlas->buffer + i * font->atlas->width;
-         uint8_t* dst = (uint8_t*)font->texture.mapped + i * font->texture.stride;
-         memcpy(dst, src, font->atlas->width);
-      }
-      vulkan_sync_texture_to_gpu(font->vk, &font->texture);
-      vulkan_copy_staging_to_dynamic(font->vk, font->vk->cmd,
+      VkCommandBuffer staging;
+      VkSubmitInfo submit_info             = { VK_STRUCTURE_TYPE_SUBMIT_INFO };
+      VkCommandBufferAllocateInfo cmd_info = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO };
+      VkCommandBufferBeginInfo begin_info  = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
+
+      cmd_info.commandPool        = font->vk->staging_pool;
+      cmd_info.level              = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
+      cmd_info.commandBufferCount = 1;
+      vkAllocateCommandBuffers(font->vk->context->device, &cmd_info, &staging);
+
+      begin_info.flags            = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
+      vkBeginCommandBuffer(staging, &begin_info);
+
+      vulkan_copy_staging_to_dynamic(font->vk, staging,
             &font->texture_optimal, &font->texture);
 
-      font->atlas->dirty = false;
+      vkEndCommandBuffer(staging);
+
+#ifdef HAVE_THREADS
+      slock_lock(font->vk->context->queue_lock);
+#endif
+
+      submit_info.commandBufferCount = 1;
+      submit_info.pCommandBuffers    = &staging;
+      vkQueueSubmit(font->vk->context->queue,
+            1, &submit_info, VK_NULL_HANDLE);
+
+      vkQueueWaitIdle(font->vk->context->queue);
+
+#ifdef HAVE_THREADS
+      slock_unlock(font->vk->context->queue_lock);
+#endif
+
+      vkFreeCommandBuffers(font->vk->context->device,
+            font->vk->staging_pool, 1, &staging);
+
+      font->needs_update = false;
    }
 
    vulkan_draw_triangles(font->vk, &call);
@@ -369,13 +419,20 @@ static void vulkan_raster_font_render_msg(
 static const struct font_glyph *vulkan_raster_font_get_glyph(
       void *data, uint32_t code)
 {
+   const struct font_glyph* glyph;
    vulkan_raster_t *font = (vulkan_raster_t*)data;
 
    if (!font || !font->font_driver)
       return NULL;
    if (!font->font_driver->ident)
        return NULL;
-   return font->font_driver->get_glyph((void*)font->font_driver, code);
+
+   glyph = font->font_driver->get_glyph((void*)font->font_driver, code);
+
+   if(glyph)
+      vulkan_raster_font_update_glyph(font, glyph);
+
+   return glyph;
 }
 
 static void vulkan_raster_font_flush_block(unsigned width, unsigned height,