diff --git a/internal/ui/chat/assistant.go b/internal/ui/chat/assistant.go
index 66459a86fd1b457907d25ee0dbd36c69b26dbd34..4ce71dda2515e5489900c33eb716e1d6d884409a 100644
--- a/internal/ui/chat/assistant.go
+++ b/internal/ui/chat/assistant.go
@@ -258,7 +258,7 @@ func (a *AssistantMessageItem) HandleMouseClick(btn ansi.MouseButton, x, y int)
 
 // HandleKeyEvent implements KeyEventHandler.
 func (a *AssistantMessageItem) HandleKeyEvent(key tea.KeyMsg) (bool, tea.Cmd) {
-	if key.String() == "c" {
+	if k := key.String(); k == "c" || k == "y" {
 		text := a.message.Content().Text
 		return true, common.CopyToClipboard(text, "Message copied to clipboard")
 	}
diff --git a/internal/ui/chat/tools.go b/internal/ui/chat/tools.go
index a91ca9b28355674a6aaf433d33b83ad838c8d446..e10d28e061e17c636dc9e1a6cfe364ca6f220d0e 100644
--- a/internal/ui/chat/tools.go
+++ b/internal/ui/chat/tools.go
@@ -420,7 +420,7 @@ func (t *baseToolMessageItem) HandleMouseClick(btn ansi.MouseButton, x, y int) b
 
 // HandleKeyEvent implements KeyEventHandler.
 func (t *baseToolMessageItem) HandleKeyEvent(key tea.KeyMsg) (bool, tea.Cmd) {
-	if key.String() == "c" {
+	if k := key.String(); k == "c" || k == "y" {
 		text := t.formatToolForCopy()
 		return true, common.CopyToClipboard(text, "Tool content copied to clipboard")
 	}
diff --git a/internal/ui/chat/user.go b/internal/ui/chat/user.go
index 3482723bfdff519afeacb6bf7a553009c42cd64f..91211590ce66dd0dd7edbde03becdf469e26b521 100644
--- a/internal/ui/chat/user.go
+++ b/internal/ui/chat/user.go
@@ -96,7 +96,7 @@ func (m *UserMessageItem) renderAttachments(width int) string {
 
 // HandleKeyEvent implements KeyEventHandler.
 func (m *UserMessageItem) HandleKeyEvent(key tea.KeyMsg) (bool, tea.Cmd) {
-	if key.String() == "c" {
+	if k := key.String(); k == "c" || k == "y" {
 		text := m.message.Content().Text
 		return true, common.CopyToClipboard(text, "Message copied to clipboard")
 	}