diff --git a/pkg/tui/views/chat/view.go b/pkg/tui/views/chat/view.go
index 7f5d74a..e0abb83 100644
--- a/pkg/tui/views/chat/view.go
+++ b/pkg/tui/views/chat/view.go
@@ -19,7 +19,6 @@ var (
 	messageHeadingStyle = lipgloss.NewStyle().
 				MarginTop(1).
 				MarginBottom(1).
-				PaddingLeft(1).
 				Bold(true)
 
 	userStyle = lipgloss.NewStyle().Faint(true).Foreground(lipgloss.Color("10"))
@@ -111,10 +110,10 @@ func (m *Model) renderMessageHeading(i int, message *api.Message) string {
 		suffix += faint.Render(fmt.Sprintf(" <%d/%d>", selectedReplyIndex+1, len(m.messages[i-1].Replies)))
 	}
 
-	if m.focus == focusMessages {
-		if i == m.selectedMessage {
-			prefix = "> "
-		}
+	if i == m.selectedMessage {
+		prefix = "> "
+	} else {
+		prefix = " "
 	}
 
 	if message.ID == 0 {
@@ -187,7 +186,7 @@ func (m *Model) renderMessage(i int) string {
 				// Only show the tool name when results are hidden
 				toolResults = append(toolResults, renderedResult{
 					ToolName: result.ToolName,
-					Result: "(hidden, press ctrl+t to view)",
+					Result:   "(hidden, press ctrl+t to view)",
 				})
 			}
 		}