diff --git a/src/xenia/debug/ui/debug_window.cc b/src/xenia/debug/ui/debug_window.cc
index d926874c5..2e1055cec 100644
--- a/src/xenia/debug/ui/debug_window.cc
+++ b/src/xenia/debug/ui/debug_window.cc
@@ -1250,7 +1250,7 @@ void DebugWindow::DrawBreakpointsPane() {
     int ci = 0;
     ImGui::Combo("##kernel_categories", &ci, its, 1, 1);
     ImGui::Dummy(ImVec2(0, 3));
-    ImGui::ListBoxHeader("##kernel_calls", 1000, 15);
+    ImGui::BeginListBox("##kernel_calls", ImVec2(1000, 15));
     auto& all_exports = emulator_->export_resolver()->all_exports_by_name();
     auto call_rankings = xe::fuzzy_filter(state.kernel_call_filter, all_exports,
                                           offsetof(cpu::Export, name));
@@ -1303,7 +1303,7 @@ void DebugWindow::DrawBreakpointsPane() {
       ImGui::Dummy(ImVec2(0, 1));
       ImGui::PopID();
     }
-    ImGui::ListBoxFooter();
+    ImGui::EndListBox();
     ImGui::Dummy(ImVec2(0, 3));
     if (kernel_popup_render_count == 2) {
       ImGui::SetKeyboardFocusHere();
@@ -1348,8 +1348,8 @@ void DebugWindow::DrawBreakpointsPane() {
   ImGui::Separator();
 
   ImGui::PushItemWidth(-1);
-  if (ImGui::ListBoxHeader("##empty",
-                           ImVec2(-1, ImGui::GetContentRegionAvail().y))) {
+  if (ImGui::BeginListBox("##empty",
+                          ImVec2(-1, ImGui::GetContentRegionAvail().y))) {
     std::vector<Breakpoint*> to_delete;
     for (auto& breakpoint : state.all_breakpoints) {
       ImGui::PushID(breakpoint.get());
@@ -1386,7 +1386,7 @@ void DebugWindow::DrawBreakpointsPane() {
       }
       ImGui::PopID();
     }
-    ImGui::ListBoxFooter();
+    ImGui::EndListBox();
     if (!to_delete.empty()) {
       for (auto breakpoint : to_delete) {
         DeleteCodeBreakpoint(breakpoint);
diff --git a/third_party/imgui b/third_party/imgui
index 1ebb91382..b81bd7ed9 160000
--- a/third_party/imgui
+++ b/third_party/imgui
@@ -1 +1 @@
-Subproject commit 1ebb91382757777382b3629ced2a573996e46453
+Subproject commit b81bd7ed984ce095c20a059dd0f4d527e006998f