diff --git a/packages/opencode/src/cli/cmd/tui/feature-plugins/system/session-v2.tsx b/packages/opencode/src/cli/cmd/tui/feature-plugins/system/session-v2.tsx
index 8b2b2ed37b2..d6658572d82 100644
--- a/packages/opencode/src/cli/cmd/tui/feature-plugins/system/session-v2.tsx
+++ b/packages/opencode/src/cli/cmd/tui/feature-plugins/system/session-v2.tsx
@@ -587,6 +587,7 @@ function InlineTool(props: {
   const [showError, setShowError] = createSignal(false)
   const error = createMemo(() => (props.part.state.status === "error" ? props.part.state.error.message : undefined))
   const complete = createMemo(() => !!props.complete)
+  const active = createMemo(() => props.part.state.status === "pending" || props.part.state.status === "running")
   const denied = createMemo(() => {
     const message = error()
     if (!message) return false
@@ -632,7 +633,7 @@ function InlineTool(props: {
     >
       <box flexShrink={0}>
         <Switch>
-          <Match when={props.spinner}>
+          <Match when={props.spinner || (!complete() && active())}>
             <Spinner color={theme.text} />
           </Match>
           <Match when={complete()}>
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index b3dc2a4a7de..09ea95fbb83 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -1795,6 +1795,7 @@ function InlineTool(props: {
   const sync = useSync()
   const renderer = useRenderer()
   const [hover, setHover] = createSignal(false)
+  const active = createMemo(() => props.part.state.status === "pending" || props.part.state.status === "running")
 
   const permission = createMemo(() => {
     const callID = sync.data.permission[ctx.sessionID]?.at(0)?.tool?.callID
@@ -1854,8 +1855,12 @@ function InlineTool(props: {
       }}
     >
       <Switch>
-        <Match when={props.spinner}>
-          <Spinner color={fg()} children={props.children} />
+        <Match when={props.spinner || (!props.complete && active())}>
+          <Spinner color={fg()}>
+            <Show when={props.complete} fallback={props.pending}>
+              {props.children}
+            </Show>
+          </Spinner>
         </Match>
         <Match when={true}>
           <text paddingLeft={3} fg={fg()} attributes={denied() ? TextAttributes.STRIKETHROUGH : undefined}>