diff --git a/include/eepp/ui/tools/uiinspector.hpp b/include/eepp/ui/tools/uiinspector.hpp
index 18ba56f13..821e0d135 100644
--- a/include/eepp/ui/tools/uiinspector.hpp
+++ b/include/eepp/ui/tools/uiinspector.hpp
@@ -7,6 +7,7 @@
 #include <eepp/ui/uiscenenode.hpp>
 #include <eepp/ui/uiwidget.hpp>
 #include <string>
+#include <unordered_map>
 
 namespace EE { namespace UI {
 
@@ -48,7 +49,9 @@ class EE_API UIInspector {
 		Scene::Node* node{ nullptr };
 		Scene::EventConnection close;
 	};
-	using NodeHandles = UnorderedMap<std::string, NodeEntry>;
+	// EventConnection is move-only; keep these entries in a node-based map so map operations do not
+	// require copying the connection through the dense map's vector storage.
+	using NodeHandles = std::unordered_map<std::string, NodeEntry>;
 	using ReverseNodeHandles = UnorderedMap<Scene::Node*, std::string>;
 
 	std::string registerNode( Scene::Node* node, const char* prefix, NodeHandles& handles,
diff --git a/src/eepp/ui/tools/uiinspectorserver.cpp b/src/eepp/ui/tools/uiinspectorserver.cpp
index 6c33ec225..f7fc98064 100644
--- a/src/eepp/ui/tools/uiinspectorserver.cpp
+++ b/src/eepp/ui/tools/uiinspectorserver.cpp
@@ -192,7 +192,7 @@ struct UIInspectorServer::Impl {
 		Uint64 client;
 		json id;
 		json commands;
-		json results{ json::object() };
+		json results = json::object();
 		std::map<std::string, json> named;
 		size_t index{ 0 };
 		unsigned frames{ 0 };