diff --git a/com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/BaseTurnWidget.java b/com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/BaseTurnWidget.java
index d8a5221a..8890a95b 100644
--- a/com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/BaseTurnWidget.java
+++ b/com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/BaseTurnWidget.java
@@ -650,6 +650,16 @@ public CompletableFuture<LanguageModelToolConfirmationResult> requestToolExecuti
     reset();
 
     this.confirmDialog = new InvokeToolConfirmationDialog(this, content, input);
+    this.confirmDialog.addDisposeListener(e -> {
+      Composite ancestor = this.getParent();
+      while (ancestor != null && !ancestor.isDisposed()) {
+        if (ancestor instanceof ChatContentViewer) {
+          ((ChatContentViewer) ancestor).requestRefreshScrollerLayout();
+          break;
+        }
+        ancestor = ancestor.getParent();
+      }
+    });
     CompletableFuture<LanguageModelToolConfirmationResult> toolConfirmationFuture = this.confirmDialog
         .getConfirmationFuture();
 
diff --git a/com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/ChatContentViewer.java b/com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/ChatContentViewer.java
index 58ee3f5d..7ef32077 100644
--- a/com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/ChatContentViewer.java
+++ b/com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/ChatContentViewer.java
@@ -404,6 +404,14 @@ public void renderErrorMessage(String errorMessage) {
     scrollToLatestUserTurn();
   }
 
+  /**
+   * Schedules a single async {@link #refreshScrollerLayout()} call so that multiple dispose/layout
+   * events that arrive in the same event-loop tick are coalesced into one pass.
+   */
+  public void requestRefreshScrollerLayout() {
+    SwtUtils.invokeOnDisplayThreadAsync(() -> refreshScrollerLayout(), this);
+  }
+
   /**
    * Update the size of scrolled composite when there are content updates.
    */
diff --git a/com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/InvokeToolConfirmationDialog.java b/com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/InvokeToolConfirmationDialog.java
index ebc307a0..1f65aead 100644
--- a/com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/InvokeToolConfirmationDialog.java
+++ b/com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/InvokeToolConfirmationDialog.java
@@ -119,10 +119,7 @@ public void cancelConfirmation() {
             && StringUtils.isNotEmpty(this.cancelMessage)) {
           new AgentToolCancelLabel(parent, SWT.NONE, this.cancelMessage);
         }
-        this.dispose();
-        if (parent != null && !parent.isDisposed()) {
-          parent.requestLayout();
-        }
+        disposeAndRequestParentLayout();
       }, this);
     }
   }
@@ -318,6 +315,10 @@ private void acceptAndDispose(ConfirmationAction action) {
         new LanguageModelToolConfirmationResult(
             ToolConfirmationResult.ACCEPT));
 
+    disposeAndRequestParentLayout();
+  }
+
+  private void disposeAndRequestParentLayout() {
     Composite parent = this.getParent();
     this.dispose();
     if (parent != null && !parent.isDisposed()) {