diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 1a2e1758fbf..500ff2b372b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -537,7 +537,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		const mutableDisposable = this._register(new MutableDisposable());
 		this._register(this.tree.onDidScroll((e) => {
 			mutableDisposable.value = dom.scheduleAtNextAnimationFrame(() => {
-				mutableDisposable.dispose();
 				if (!e.scrollTopChanged || e.heightChanged || e.scrollHeightChanged) {
 					return;
 				}
@@ -548,8 +547,9 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				}
 
 				const newHeight = Math.min(renderHeight + diff, maxHeight);
-				const inputPartHeight = this.inputPart.layout(newHeight, this.container.offsetWidth);
-				this.layout(newHeight + inputPartHeight, this.container.offsetWidth);
+				const width = this.bodyDimension?.width ?? this.container.offsetWidth;
+				const inputPartHeight = this.inputPart.layout(newHeight, width);
+				this.layout(newHeight + inputPartHeight, width);
 			});
 		}));
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 33b798459ea..60b78970f75 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -426,6 +426,7 @@
 
 .quick-input-widget .interactive-session .interactive-input-and-execute-toolbar {
 	margin: 0;
+	border-radius: 2px;
 }
 
 /* #endregion */