diff --git a/internal/ui/model/ui.go b/internal/ui/model/ui.go
index 0134751359f2ae9bc7249ae4d04a83fee487a344..3952f05015e4a191c078c2774aa43640f2db7b30 100644
--- a/internal/ui/model/ui.go
+++ b/internal/ui/model/ui.go
@@ -2559,8 +2559,8 @@ func (m *UI) getMessageIDFromItem(item list.Item) (string, bool) {
 	}
 	if msgItem, ok := item.(chat.MessageItem); ok {
 		itemID := msgItem.ID()
-		if strings.HasSuffix(itemID, ":assistant-info") {
-			baseID := strings.TrimSuffix(itemID, ":assistant-info")
+		if before, ok := strings.CutSuffix(itemID, ":assistant-info"); ok {
+			baseID := before
 			return baseID, true
 		}
 		return itemID, true