diff --git a/pkg/tui/components/messages/messages.go b/pkg/tui/components/messages/messages.go
index 3efba45b6..684769a8e 100644
--- a/pkg/tui/components/messages/messages.go
+++ b/pkg/tui/components/messages/messages.go
@@ -520,6 +520,7 @@ func (m *model) AddUserMessage(content string) tea.Cmd {
 }
 
 func (m *model) AddErrorMessage(content string) tea.Cmd {
+	m.removeSpinner()
 	return m.addMessage(types.Error(content))
 }
 
diff --git a/pkg/tui/page/chat/chat.go b/pkg/tui/page/chat/chat.go
index ff07295a3..c97be4f70 100644
--- a/pkg/tui/page/chat/chat.go
+++ b/pkg/tui/page/chat/chat.go
@@ -324,7 +324,7 @@ func (p *chatPage) Update(msg tea.Msg) (layout.Model, tea.Cmd) {
 
 		return p, tea.Batch(spinnerCmd, dialogCmd)
 	case *runtime.ElicitationRequestEvent:
-		// TODO: handle normal elicitation requsets
+		// TODO: handle normal elicitation requests
 		spinnerCmd := p.setWorking(false)
 
 		serverURL := msg.Meta["cagent/server_url"].(string)