diff --git a/bot.go b/bot.go
index b2de311..21fcf25 100644
--- a/bot.go
+++ b/bot.go
@@ -454,8 +454,8 @@ func findCall(msg, toolCall string, tv *tview.TextView) {
 func chatToTextSlice(showSys bool) []string {
 	resp := make([]string, len(chatBody.Messages))
 	for i, msg := range chatBody.Messages {
-		// INFO: skips system msg
-		if !showSys && (msg.Role != cfg.AssistantRole && msg.Role != cfg.UserRole) {
+		// INFO: skips system msg and tool msg
+		if !showSys && (msg.Role == cfg.ToolRole || msg.Role == "system") {
 			continue
 		}
 		resp[i] = msg.ToText(i)
diff --git a/tui.go b/tui.go
index b91058c..ee0e5e6 100644
--- a/tui.go
+++ b/tui.go
@@ -558,7 +558,7 @@ func init() {
 		if event.Key() == tcell.KeyF5 {
 			// switch cfg.ShowSys
 			cfg.ShowSys = !cfg.ShowSys
-			textView.SetText(chatToText(cfg.ShowSys)) // TODO: fix removing all new names
+			textView.SetText(chatToText(cfg.ShowSys))
 			colorText()
 		}
 		if event.Key() == tcell.KeyF6 {