diff --git a/app/MindWork AI Studio/Components/ChatComponent.razor.cs b/app/MindWork AI Studio/Components/ChatComponent.razor.cs
index 4c604753..71337e9e 100644
--- a/app/MindWork AI Studio/Components/ChatComponent.razor.cs	
+++ b/app/MindWork AI Studio/Components/ChatComponent.razor.cs	
@@ -939,7 +939,7 @@ private Task EditLastUserBlock(IContent block)
         if(lastBlockContent is null)
             return Task.CompletedTask;
         
-        this.userInput = textBlock.Text;
+        this.RestoreComposerFromTextBlock(textBlock);
         this.ChatThread.Remove(block);
         this.ChatThread.Remove(lastBlockContent);
         this.hasUnsavedChanges = true;
@@ -956,13 +956,22 @@ private Task EditLastBlock(IContent block)
         if (block is not ContentText textBlock)
             return Task.CompletedTask;
         
-        this.userInput = textBlock.Text;
+        this.RestoreComposerFromTextBlock(textBlock);
         this.ChatThread.Remove(block);
         this.hasUnsavedChanges = true;
         this.StateHasChanged();
         
         return Task.CompletedTask;
     }
+
+    private void RestoreComposerFromTextBlock(ContentText textBlock)
+    {
+        this.userInput = textBlock.Text;
+        this.chatDocumentPaths.Clear();
+
+        foreach (var attachment in textBlock.FileAttachments)
+            this.chatDocumentPaths.Add(attachment.Normalize());
+    }
     
     #region Overrides of MSGComponentBase
     
diff --git a/app/MindWork AI Studio/wwwroot/changelog/v26.4.1.md b/app/MindWork AI Studio/wwwroot/changelog/v26.4.1.md
index 3ff00c6a..cd26232e 100644
--- a/app/MindWork AI Studio/wwwroot/changelog/v26.4.1.md	
+++ b/app/MindWork AI Studio/wwwroot/changelog/v26.4.1.md	
@@ -37,6 +37,7 @@
 - Fixed an issue where file and folder selection dialogs could open more than once on Windows. Thanks to Bernhard for reporting this bug.
 - Fixed an issue where exporting to Word could fail when the message contained certain formatting.
 - Fixed security issues in the native app runtime by strengthening how AI Studio creates and protects the secret values used for its internal secure connection.
+- Fixed an issue where documents were detached when editing a previous prompt. They now remain attached.
 - Updated several security-sensitive Rust dependencies in the native runtime to address known vulnerabilities.
 - Updated .NET to v9.0.15
 - Updated dependencies
\ No newline at end of file