diff --git a/src/renderer/actions/worktreeActions.ts b/src/renderer/actions/worktreeActions.ts
index 500613d2..72e3597f 100644
--- a/src/renderer/actions/worktreeActions.ts
+++ b/src/renderer/actions/worktreeActions.ts
@@ -27,9 +27,14 @@ export async function performWorktreeRemoval(
     });
   }
 
-  const removedTabIds = useDevTerminalStore.getState().removeTabsForWorktree(worktreePath);
+  const termStore = useDevTerminalStore.getState();
+  const removedTabIds = termStore.removeTabsForWorktree(worktreePath);
   await closeThreads(removedTabIds);
 
+  if (termStore.isOpen && termStore.activeWorktreePath === worktreePath) {
+    termStore.closePanel();
+  }
+
   useGitStore.getState().clearWorktreeStatus(worktreePath);
 
   const panelStore = usePanelStore.getState();