diff --git a/.gitignore b/.gitignore
index cd9b16c99..53fcf3dcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ tmtags
 npm-debug.log
 private/
 *.trace
+imgui.ini
 
 # ==============================================================================
 # Build system output
diff --git a/.gitmodules b/.gitmodules
index 58ca605a0..10591be7f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "third_party/catch"]
 	path = third_party/catch
 	url = https://github.com/philsquared/Catch.git
+[submodule "third_party/imgui"]
+	path = third_party/imgui
+	url = https://github.com/ocornut/imgui.git
diff --git a/third_party/imgui b/third_party/imgui
new file mode 160000
index 000000000..364d4a1ae
--- /dev/null
+++ b/third_party/imgui
@@ -0,0 +1 @@
+Subproject commit 364d4a1ae6fb2ec4dca8dc41d5c844ab3ab092a5
diff --git a/third_party/imgui.gypi b/third_party/imgui.gypi
new file mode 100644
index 000000000..3e87ca450
--- /dev/null
+++ b/third_party/imgui.gypi
@@ -0,0 +1,28 @@
+# Copyright 2015 Ben Vanik. All Rights Reserved.
+{
+  'targets': [
+    {
+      'target_name': 'imgui',
+      'type': '<(library)',
+
+      'direct_dependent_settings': {
+        'include_dirs': [
+          'imgui/',
+        ],
+      },
+
+      'include_dirs': [
+        'imgui/',
+      ],
+
+      'sources': [
+        'imgui/imconfig.h',
+        'imgui/imgui.cpp',
+        'imgui/imgui.h',
+        'imgui/stb_rect_pack.h',
+        'imgui/stb_textedit.h',
+        'imgui/stb_truetype.h',
+      ],
+    }
+  ]
+}
diff --git a/xenia.gyp b/xenia.gyp
index fee673afd..49ad57923 100644
--- a/xenia.gyp
+++ b/xenia.gyp
@@ -7,6 +7,7 @@
     'third_party/beaengine.gypi',
     'third_party/gflags.gypi',
     'third_party/glew.gypi',
+    'third_party/imgui.gypi',
     'third_party/llvm.gypi',
     'third_party/sparsehash.gypi',
     'third_party/xxhash.gypi',
@@ -482,6 +483,7 @@
       },
 
       'dependencies': [
+        'imgui',
         'libxenia',
       ],