diff --git a/src/claude_memory/ui/static/index.html b/src/claude_memory/ui/static/index.html
index ecb26fc..c28d499 100644
--- a/src/claude_memory/ui/static/index.html
+++ b/src/claude_memory/ui/static/index.html
@@ -468,7 +468,7 @@
       </div>
 
       <!-- Tab: Graph -->
-      <div x-show="$store.app.activeTab === 'graph'" x-data="graphComponent()" x-init="$watch('$store.app.activeTab', v => { if (v === 'graph' && memories.length === 0) init(); })">
+      <div x-show="$store.app.activeTab === 'graph'" x-data="graphComponent()" x-init="$watch('$store.app.activeTab', v => { if (v === 'graph') { if (memories.length === 0) init(); else setTimeout(() => render(), 100); } })">
         <div class="flex flex-wrap gap-2 mb-4">
           <template x-for="cat in categories" :key="cat">
             <label class="flex items-center gap-1 text-sm cursor-pointer" style="color: var(--text-secondary)">
diff --git a/src/claude_memory/ui/static/js/graph.js b/src/claude_memory/ui/static/js/graph.js
index 6fa4d60..0072e03 100644
--- a/src/claude_memory/ui/static/js/graph.js
+++ b/src/claude_memory/ui/static/js/graph.js
@@ -18,7 +18,7 @@ function graphComponent() {
         this.memories = memData.memories;
         this.categories = catData.categories;
         this.categories.forEach(c => this.selectedCategories[c] = true);
-        this.$nextTick(() => this.render());
+        setTimeout(() => this.render(), 100);
       } catch (e) {
         console.error('Failed to load graph data:', e);
       }
@@ -45,7 +45,7 @@ function graphComponent() {
       const memories = this.getFilteredMemories().slice(0, 300);
       if (memories.length === 0) return;
 
-      const width = container.clientWidth;
+      const width = container.clientWidth || container.parentElement?.clientWidth || 800;
       const height = container.clientHeight || 500;
 
       // Build nodes and tag-based edges