diff --git a/cmd/archipulse/ui/src/routes/ModelEditor.svelte b/cmd/archipulse/ui/src/routes/ModelEditor.svelte
index 079340f..0085b16 100644
--- a/cmd/archipulse/ui/src/routes/ModelEditor.svelte
+++ b/cmd/archipulse/ui/src/routes/ModelEditor.svelte
@@ -70,7 +70,10 @@
   let relSearch      = '';
   let activeRelType  = '';  // '' = all
 
-  $: elementsById = Object.fromEntries(elements.map(e => [e.source_id, e]));
+  $: elementsById = Object.fromEntries([
+    ...elements.map(e => [e.id, e]),
+    ...elements.filter(e => e.source_id).map(e => [e.source_id, e]),
+  ]);
 
   $: relTypes = [...new Set(relationships.map(r => r.type))].sort();