diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79a99f8..b9e7b9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,9 +26,7 @@ else ()
   if (CMAKE_COMPILER_IS_GNUCXX AND
       CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8)
     # TODO(binji): These warnings should only be disabled for imgui.
-    set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}
-      "-Wno-class-memaccess -Wno-stringop-truncation"
-      )
+    set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wno-stringop-truncation)
   endif ()
 endif ()
 
@@ -68,6 +66,7 @@ if (NOT EMSCRIPTEN)
     add_executable(binjgb-debugger
       third_party/imgui/imgui.cpp
       third_party/imgui/imgui_draw.cpp
+      third_party/imgui/imgui_widgets.cpp
       third_party/imgui_dock/imgui_dock.cpp
       src/memory.c
       src/common.c
diff --git a/src/debugger/debugger.cc b/src/debugger/debugger.cc
index 4e777d4..a388e51 100644
--- a/src/debugger/debugger.cc
+++ b/src/debugger/debugger.cc
@@ -117,6 +117,8 @@ bool Debugger::Init(const char* filename, int audio_frequency, int audio_frames,
     return false;
   }
 
+  ImGui::CreateContext();
+
   run_state = paused_at_start ? Paused : Running;
 
   ZERO_MEMORY(emulator_init);
diff --git a/third_party/imgui b/third_party/imgui
index b1d90b5..e0cab56 160000
--- a/third_party/imgui
+++ b/third_party/imgui
@@ -1 +1 @@
-Subproject commit b1d90b565d9e1364254b974715824a46f9caea8c
+Subproject commit e0cab5664adf02c030f9cf2a05d2c334638a85f8