diff --git a/frontend/src/components/workflow/nodes/AnalysisNode.jsx b/frontend/src/components/workflow/nodes/AnalysisNode.jsx
index 77069a2..d7f9e7c 100644
--- a/frontend/src/components/workflow/nodes/AnalysisNode.jsx
+++ b/frontend/src/components/workflow/nodes/AnalysisNode.jsx
@@ -5,16 +5,22 @@ import { Handle, Position } from 'reactflow'
  *
  * Properties:
  * - data.label: Node-Label
- * - data.prompt_slug: Slug des referenzierten Basis-Prompts
+ * - data.prompt_slug: Slug des referenzierten Basis-Prompts (Reference Mode)
+ * - data.inline_template: Inline Prompt-Template (Inline Mode)
  * - data.prompt_name: Name des Prompts (optional, für Display)
  * - data.questions: Array von Question Augmentations
  * - selected: Boolean
  */
 export function AnalysisNode({ data, selected }) {
   const hasQuestions = data.questions?.length > 0
-  const promptName = data.prompt_name || (data.prompt_slug ? `Prompt: ${data.prompt_slug}` : 'Kein Prompt')
   const questionCount = data.questions?.length || 0
 
+  // Part 3: Inline Prompts - Zeige "Inline-Template" oder Prompt-Namen
+  const isInlineMode = data.inline_template !== null && data.inline_template !== undefined
+  const promptName = isInlineMode
+    ? '✏️ Inline-Template'
+    : (data.prompt_name || (data.prompt_slug ? `Prompt: ${data.prompt_slug}` : 'Kein Prompt'))
+
   return (
     <div className={`workflow-node analysis-node ${selected ? 'selected' : ''}`}>
       <div className="node-header">
diff --git a/frontend/src/pages/WorkflowEditorPage.jsx b/frontend/src/pages/WorkflowEditorPage.jsx
index 08a486f..0aa4433 100644
--- a/frontend/src/pages/WorkflowEditorPage.jsx
+++ b/frontend/src/pages/WorkflowEditorPage.jsx
@@ -520,9 +520,9 @@ export default function WorkflowEditorPage() {
                           checked={isInlineMode}
                           onChange={() => {
                             // Wechsel zu Inline Mode
+                            // WICHTIG: prompt_slug NICHT löschen, damit er beim Zurückwechseln noch da ist
                             handleNodeUpdate(selectedNode.id, {
-                              prompt_slug: null,  // Reference löschen
-                              inline_template: selectedNode.data.inline_template || ''  // Behalte existierendes template
+                              inline_template: selectedNode.data.inline_template || ''  // Aktiviere Inline Mode
                             })
                           }}
                           style={{ marginRight: '8px' }}
@@ -542,7 +542,7 @@ export default function WorkflowEditorPage() {
                           const promptSlug = e.target.value
                           const selectedPrompt = availablePrompts.find(p => p.slug === promptSlug)
                           handleNodeUpdate(selectedNode.id, {
-                            prompt_slug: promptSlug || '',
+                            prompt_slug: promptSlug,
                             prompt_name: selectedPrompt?.name || null,
                             inline_template: null
                           })