diff --git a/frontend/src/app/canvas/CanvasMenubar.tsx b/frontend/src/app/canvas/CanvasMenubar.tsx
index 81cca70..28c6e4a 100644
--- a/frontend/src/app/canvas/CanvasMenubar.tsx
+++ b/frontend/src/app/canvas/CanvasMenubar.tsx
@@ -80,7 +80,13 @@ export function CanvasMenubar({
   const prevSaveStatusRef = useRef<SaveStatus>(saveStatus)
 
   useEffect(() => {
-    if (prevSaveStatusRef.current === 'saving' && saveStatus === 'saved') {
+    if (saveStatus === 'unsaved') {
+      setShowSavedBriefly(false)
+      if (savedBrieflyTimerRef.current) {
+        clearTimeout(savedBrieflyTimerRef.current)
+        savedBrieflyTimerRef.current = null
+      }
+    } else if (prevSaveStatusRef.current === 'saving' && saveStatus === 'saved') {
       setShowSavedBriefly(true)
       if (savedBrieflyTimerRef.current) clearTimeout(savedBrieflyTimerRef.current)
       savedBrieflyTimerRef.current = setTimeout(() => {
@@ -330,7 +336,7 @@ export function CanvasMenubar({
                       {saveStatus === 'unsaved' && (
                         <CircleDot className="size-3.5" aria-hidden />
                       )}
-                      {(saveStatus === 'saved' || showSavedBriefly) && (
+                      {saveStatus !== 'unsaved' && (saveStatus === 'saved' || showSavedBriefly) && (
                         <CheckCircle2 className="size-3.5 text-muted-foreground/70" aria-hidden />
                       )}
                     </span>
diff --git a/frontend/src/app/canvas/useCanvasGraph.ts b/frontend/src/app/canvas/useCanvasGraph.ts
index ef4a437..d3c89f3 100644
--- a/frontend/src/app/canvas/useCanvasGraph.ts
+++ b/frontend/src/app/canvas/useCanvasGraph.ts
@@ -1,13 +1,11 @@
 /**
  * Hook for canvas graph state and persistence. Wraps useGraphStateWithHistory
- * with initial graph from project storage (or example). Save is explicit via save();
- * autosave runs on an interval (~10s) and saves when the graph has changed.
+ * with initial graph from project storage (or example). Save is explicit via save().
  */
 
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useMemo, useRef, useState } from 'react'
 import { useGraphStateWithHistory } from '@/hooks/useGraphStateWithHistory'
 import { getInitialGraph } from '@/app/canvas/canvasGraphUtils'
-import { useCanvasStore } from '@/app/canvas/canvasStore'
 import { saveGraphToStorage, PROJECT_VERSION } from '@/app/pleroma/projectGraphStorage'
 import type { AppNode, AppEdge } from '@/lib/graph/nodeTypes'
 
@@ -20,70 +18,46 @@ export type UseCanvasGraphResult = ReturnType<typeof useGraphStateWithHistory> &
   saveStatus: SaveStatus
 }
 
-const AUTOSAVE_INTERVAL_MS = 10_000
-
 export function useCanvasGraph(projectId: string | undefined): UseCanvasGraphResult {
   const initialGraph = useMemo(() => getInitialGraph(projectId), [projectId])
   const result = useGraphStateWithHistory(initialGraph.nodes, initialGraph.edges)
   const { nodes, edges } = result
 
-  const storeNodes = useCanvasStore((s) => s.graph.nodes)
-  const storeEdges = useCanvasStore((s) => s.graph.edges)
-
   const nodesRef = useRef(nodes)
   const edgesRef = useRef(edges)
   nodesRef.current = nodes
   edgesRef.current = edges
 
   const [isSaving, setIsSaving] = useState(false)
-  const lastSavedSnapshotRef = useRef(
+  const [lastSavedSerialized, setLastSavedSerialized] = useState(() =>
     JSON.stringify({ nodes: initialGraph.nodes, edges: initialGraph.edges })
   )
 
-  const serializedFromStore = useMemo(
-    () => JSON.stringify({ nodes: storeNodes, edges: storeEdges }),
-    [storeNodes, storeEdges]
+  const currentSerialized = useMemo(
+    () => JSON.stringify({ nodes, edges }),
+    [nodes, edges]
   )
-  const isDirty = serializedFromStore !== lastSavedSnapshotRef.current
+  const isDirty = currentSerialized !== lastSavedSerialized
   const saveStatus: SaveStatus = isSaving ? 'saving' : isDirty ? 'unsaved' : 'saved'
 
-  const performSave = useCallback(() => {
-    if (!projectId) return
-    const current = JSON.stringify({
-      nodes: nodesRef.current,
-      edges: edgesRef.current,
-    })
-    if (current === lastSavedSnapshotRef.current) return
-    setIsSaving(true)
-    saveGraphToStorage(projectId, {
-      version: PROJECT_VERSION,
-      nodes: nodesRef.current,
-      edges: edgesRef.current,
-    })
-    lastSavedSnapshotRef.current = current
-    setIsSaving(false)
-  }, [projectId])
-
   const save = useCallback(() => {
     if (!projectId) return
+    const snapshot = JSON.stringify({
+      nodes: nodesRef.current,
+      edges: edgesRef.current,
+    })
     setIsSaving(true)
     saveGraphToStorage(projectId, {
       version: PROJECT_VERSION,
       nodes: nodesRef.current,
       edges: edgesRef.current,
     })
-    lastSavedSnapshotRef.current = JSON.stringify({
-      nodes: nodesRef.current,
-      edges: edgesRef.current,
-    })
-    setIsSaving(false)
+    const SAVING_DISPLAY_MS = 360
+    setTimeout(() => {
+      setLastSavedSerialized(snapshot)
+      setIsSaving(false)
+    }, SAVING_DISPLAY_MS)
   }, [projectId])
 
-  useEffect(() => {
-    if (!projectId) return
-    const id = setInterval(performSave, AUTOSAVE_INTERVAL_MS)
-    return () => clearInterval(id)
-  }, [projectId, performSave])
-
   return { ...result, save, saveStatus }
 }
diff --git a/frontend/src/components/editor/CodeEditor.tsx b/frontend/src/components/editor/CodeEditor.tsx
index 7b81986..3ecad9c 100644
--- a/frontend/src/components/editor/CodeEditor.tsx
+++ b/frontend/src/components/editor/CodeEditor.tsx
@@ -92,7 +92,7 @@ export function CodeEditor({
   }, [value, textareaId])
 
   return (
-    <div ref={containerRef} className="code-editor" style={{ minHeight: 0 }}>
+    <div ref={containerRef} className="code-editor min-h-0 h-full overflow-auto" style={{ minHeight: 0 }}>
       <Editor
         value={value}
         onValueChange={handleValueChange}
diff --git a/frontend/src/components/graph/BaseNode.tsx b/frontend/src/components/graph/BaseNode.tsx
index be3fe3c..319e821 100644
--- a/frontend/src/components/graph/BaseNode.tsx
+++ b/frontend/src/components/graph/BaseNode.tsx
@@ -75,11 +75,14 @@ export function BaseNode({
       data-selected={selected}
       data-path-role={connectionPathRole ?? undefined}
       style={appliedStyle}
-      tabIndex={0}
+      tabIndex={selected ? 0 : -1}
       {...props}
     >
       <div
-        className="min-h-0 flex-1 flex flex-col overflow-hidden"
+        className={cn(
+          "min-h-0 flex-1 flex flex-col overflow-hidden",
+          !selected && "pointer-events-none",
+        )}
         style={{ contain: "layout" }}
       >
         {children}
@@ -96,7 +99,9 @@ export function BaseNode({
           handleClassName="base-node-resize-handle nodrag nopan"
         />
       )}
-      {!isFullscreenInstance && handles}
+      {!isFullscreenInstance && (
+        <div className={cn(!selected && "pointer-events-none")}>{handles}</div>
+      )}
     </div>
   );
 }
@@ -198,7 +203,7 @@ export function BaseNodeContent({
   return (
     <div
       data-slot="base-node-content"
-      className={cn("min-h-0 flex-1 flex flex-col overflow-auto", className)}
+      className={cn("min-h-0 flex-1 flex flex-col", className)}
       {...props}
     />
   );
diff --git a/frontend/src/components/nodes/config/ConfigNode.tsx b/frontend/src/components/nodes/config/ConfigNode.tsx
index 876e389..c9097ae 100644
--- a/frontend/src/components/nodes/config/ConfigNode.tsx
+++ b/frontend/src/components/nodes/config/ConfigNode.tsx
@@ -307,7 +307,7 @@ function ConfigNodeComponent({ id, data, width, height, selected }: Props) {
                     />
                 </div>
 
-                <div ref={editorContainerRef as React.RefObject<HTMLDivElement>} className="min-h-0 flex-1 w-full nodrag nopan overflow-auto border-t border-input" style={{ minHeight: editorHeight }}>
+                <div ref={editorContainerRef as React.RefObject<HTMLDivElement>} className="min-h-0 flex-1 w-full nodrag nopan overflow-hidden border-t border-input" style={{ minHeight: editorHeight }}>
                     <CodeEditor
                         textareaId={editorId}
                         value={content}