diff --git a/Runtime/ImGuiConsole.cpp b/Runtime/ImGuiConsole.cpp
index 06fe1e7b3..8602982ee 100644
--- a/Runtime/ImGuiConsole.cpp
+++ b/Runtime/ImGuiConsole.cpp
@@ -179,7 +179,7 @@ void ImGuiConsole::BeginEntityRow(const ImGuiEntityEntry& entry) {
   ImGui::PushStyleColor(ImGuiCol_Text, textColor);
 
   if (ImGui::TableNextColumn()) {
-    auto text = fmt::format(FMT_STRING("{:x}"), entry.uid.Value());
+    auto text = fmt::format(FMT_STRING("0x{:04X}"), entry.uid.Value());
     ImGui::Selectable(text.c_str(), &entry.ent->m_debugSelected,
                       ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowItemOverlap);
     if (ImGui::IsItemHovered()) {
@@ -319,7 +319,7 @@ void ImGuiConsole::ShowInspectWindow(bool* isOpen) {
 bool ImGuiConsole::ShowEntityInfoWindow(TUniqueId uid) {
   bool open = true;
   ImGuiEntityEntry& entry = ImGuiConsole::entities[uid.Value()];
-  auto name = fmt::format(FMT_STRING("{}##{:x}"), !entry.name.empty() ? entry.name : entry.type, uid.Value());
+  auto name = fmt::format(FMT_STRING("{}##0x{:04X}"), !entry.name.empty() ? entry.name : entry.type, uid.Value());
   if (ImGui::Begin(name.c_str(), &open, ImGuiWindowFlags_AlwaysAutoResize)) {
     ImGui::PushID(uid.Value());
     entry.ent->ImGuiInspect();
diff --git a/Runtime/ImGuiEntitySupport.cpp b/Runtime/ImGuiEntitySupport.cpp
index 72a8653c0..77784faf5 100644
--- a/Runtime/ImGuiEntitySupport.cpp
+++ b/Runtime/ImGuiEntitySupport.cpp
@@ -273,7 +273,9 @@ void CEntity::ImGuiInspect() {
     }
   }
   if (ImGui::CollapsingHeader("Entity", ImGuiTreeNodeFlags_DefaultOpen)) {
-    ImGui::Text("ID: %x", x8_uid.Value());
+    ImGui::Text("ID: 0x%04X", x8_uid.Value());
+    ImGui::Text("Editor ID: 0x%08X", xc_editorId.id);
+    ImGui::Text("Area: %i", x4_areaId);
     ImGui::Text("Name: %s", x10_name.c_str());
     BITFIELD_CHECKBOX("Active", x30_24_active);
     ImGui::Checkbox("Highlight", &m_debugSelected);