diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
index 97529092..7aa63188 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
@@ -1814,7 +1814,7 @@ const CommandTool = ({ toolMessage, type, threadId }: { threadId: string } & ({
 	}
 
 	return <>
-		<ToolHeaderWrapper {...componentParams} isOpen={toolMessage.type === 'running_now' ? true : undefined} />
+		<ToolHeaderWrapper {...componentParams} isOpen={type === 'run_command' && toolMessage.type === 'running_now' ? true : undefined} />
 	</>
 }
 
diff --git a/src/vs/workbench/contrib/void/browser/terminalToolService.ts b/src/vs/workbench/contrib/void/browser/terminalToolService.ts
index c4e62906..86510b39 100644
--- a/src/vs/workbench/contrib/void/browser/terminalToolService.ts
+++ b/src/vs/workbench/contrib/void/browser/terminalToolService.ts
@@ -246,6 +246,8 @@ export class TerminalToolService extends Disposable implements ITerminalToolServ
 		})
 
 		const capability = await Promise.any([waitFiveSeconds, waitForCapability])
+			.finally(() => { disposables.forEach((d) => d.dispose()) })
+
 		return capability ?? undefined
 	}
 
@@ -333,8 +335,8 @@ export class TerminalToolService extends Disposable implements ITerminalToolServ
 
 			// wait for result
 			await Promise.any([waitUntilDone, waitUntilInterrupt])
+				.finally(() => disposables.forEach(d => d.dispose()))
 
-			disposables.forEach(d => d.dispose())
 			if (!isPersistent) {
 				interrupt()
 			}