diff --git a/src/xenia/kernel/xam/xam_ui.cc b/src/xenia/kernel/xam/xam_ui.cc
index e2a686962..970def8bb 100644
--- a/src/xenia/kernel/xam/xam_ui.cc
+++ b/src/xenia/kernel/xam/xam_ui.cc
@@ -704,11 +704,11 @@ class GameAchievementsDialog final : public XamDialog {
   std::map<uint32_t, std::unique_ptr<ui::ImmediateTexture>> achievements_icons_;
 };
 
-class GamesInfoDialog final : public ui::ImGuiDialog {
+class GamesInfoDialog final : public XamDialog {
  public:
   GamesInfoDialog(ui::ImGuiDrawer* imgui_drawer, const ImVec2 drawing_position,
                   const UserProfile* profile)
-      : ui::ImGuiDialog(imgui_drawer),
+      : XamDialog(imgui_drawer),
         drawing_position_(drawing_position),
         profile_(profile),
         profile_manager_(kernel_state()->xam_state()->profile_manager()),
@@ -843,6 +843,7 @@ class GamesInfoDialog final : public ui::ImGuiDialog {
                       ImGuiWindowFlags_NoCollapse |
                           ImGuiWindowFlags_AlwaysAutoResize |
                           ImGuiWindowFlags_HorizontalScrollbar)) {
+      Close();
       ImGui::End();
       return;
     }
@@ -890,12 +891,13 @@ class GamesInfoDialog final : public ui::ImGuiDialog {
       ImGui::PopFont();
     }
 
-    ImGui::End();
-
     if (!dialog_open) {
-      delete this;
+      Close();
+      ImGui::End();
       return;
     }
+
+    ImGui::End();
   }
 
   static constexpr uint8_t title_name_filter_size = 15;
diff --git a/src/xenia/ui/vulkan/vulkan_immediate_drawer.h b/src/xenia/ui/vulkan/vulkan_immediate_drawer.h
index ca087e1cb..de98dfb50 100644
--- a/src/xenia/ui/vulkan/vulkan_immediate_drawer.h
+++ b/src/xenia/ui/vulkan/vulkan_immediate_drawer.h
@@ -145,7 +145,7 @@ class VulkanImmediateDrawer : public ImmediateDrawer {
   };
   std::deque<SubmittedTextureUploadBuffer> texture_upload_buffers_submitted_;
   // Resource and last usage submission pairs.
-  std::vector<std::pair<VulkanImmediateTexture::Resource, uint64_t>>
+  std::deque<std::pair<VulkanImmediateTexture::Resource, uint64_t>>
       textures_deleted_;
 
   std::unique_ptr<VulkanUploadBufferPool> vertex_buffer_pool_;