diff --git a/internal/tui/components/chat/editor/editor.go b/internal/tui/components/chat/editor/editor.go
index 72be82c7e1ee88fe8ae367e65c577b1b423dbdb8..48b11dea081f12c91bd001d2c6aafde0b402ec1d 100644
--- a/internal/tui/components/chat/editor/editor.go
+++ b/internal/tui/components/chat/editor/editor.go
@@ -289,7 +289,8 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		if !model.SupportsImages {
 			return m, util.ReportWarn("File attachments are not supported by the current model: " + model.Name)
 		}
-		return m, util.CmdHandler(onPaste(msg)) // inject fsys accessible from PWD
+        return m, filepicker.OnPaste(filepicker.ResolveFS, string(msg)) // inject fsys accessibly from PWD
+
 	case commands.ToggleYoloModeMsg:
 		m.setEditorPrompt()
 		return m, nil