From 602bc14dbae045134fc61fdac298d9fb080c46c0 Mon Sep 17 00:00:00 2001
From: Elijah King <elijahwilliamking@icloud.com>
Date: Sun, 31 Aug 2025 18:53:18 -0700
Subject: [PATCH] fixed multi history display

---
 src/vs/workbench/contrib/chat/browser/chatWidget.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index efc34d7a123..d52802d6106 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -942,14 +942,15 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				welcomeContent = this.getWelcomeViewContent(additionalMessage);
 				welcomeContent.tips = tips;
 			}
-			// Optional: recent chat history above welcome content when enabled
-			const showHistory = this.configurationService.getValue<boolean>(ChatConfiguration.EmptyStateHistoryEnabled);
-			if (showHistory) {
-				this.renderWelcomeHistorySection();
-			}
-
 			if (!this.welcomePart.value || this.welcomePart.value.needsRerender(welcomeContent)) {
 				dom.clearNode(this.welcomeMessageContainer);
+
+				// Optional: recent chat history above welcome content when enabled
+				const showHistory = this.configurationService.getValue<boolean>(ChatConfiguration.EmptyStateHistoryEnabled);
+				if (showHistory) {
+					this.renderWelcomeHistorySection();
+				}
+
 				this.welcomePart.value = this.instantiationService.createInstance(
 					ChatViewWelcomePart,
 					welcomeContent,