diff --git a/src/Terrabuild.UI/src/App.tsx b/src/Terrabuild.UI/src/App.tsx
index f07771e3..809b8465 100644
--- a/src/Terrabuild.UI/src/App.tsx
+++ b/src/Terrabuild.UI/src/App.tsx
@@ -123,6 +123,8 @@ const App = () => {
   const terminalReady = useRef(false);
   const activeProjectRef = useRef<string | null>(null);
   const selectedTargetKeyRef = useRef<string | null>(null);
+  const resizeObserverRef = useRef<ResizeObserver | null>(null);
+  const handleResizeRef = useRef<(() => void) | null>(null);
   const pendingTargetRef = useRef<{ key: string; target: GraphNode } | null>(
     null
   );
@@ -194,6 +196,16 @@ const App = () => {
     terminalReady.current = true;
     applyTerminalTheme();
     flushPendingTerminalActions();
+    const handleResize = () => {
+      if (
+        !terminalRef.current ||
+        terminalRef.current.offsetWidth === 0 ||
+        terminalRef.current.offsetHeight === 0
+      ) {
+        return;
+      }
+      fit.fit();
+    };
     const resizeObserver = new ResizeObserver(() => {
       if (!terminalRef.current) {
         return;
@@ -207,6 +219,8 @@ const App = () => {
       fit.fit();
     });
     resizeObserver.observe(terminalRef.current);
+    resizeObserverRef.current = resizeObserver;
+    handleResizeRef.current = handleResize;
     requestAnimationFrame(() => {
       if (!terminalRef.current) {
         return;
@@ -220,27 +234,24 @@ const App = () => {
       fit.fit();
       applyTerminalTheme();
     });
-    const handleResize = () => {
-      if (
-        !terminalRef.current ||
-        terminalRef.current.offsetWidth === 0 ||
-        terminalRef.current.offsetHeight === 0
-      ) {
-        return;
-      }
-      fit.fit();
-    };
     window.addEventListener("resize", handleResize);
+  }, [showTerminal]);
+
+  useEffect(() => {
     return () => {
-      window.removeEventListener("resize", handleResize);
-      resizeObserver.disconnect();
-      terminalReady.current = false;
-      term.write("\u001b[?25h");
-      term.dispose();
+      if (handleResizeRef.current) {
+        window.removeEventListener("resize", handleResizeRef.current);
+      }
+      resizeObserverRef.current?.disconnect();
+      if (terminal.current) {
+        terminalReady.current = false;
+        terminal.current.write("\u001b[?25h");
+        terminal.current.dispose();
+      }
       terminal.current = null;
       fitAddon.current = null;
     };
-  }, [showTerminal]);
+  }, []);
 
   useEffect(() => {
     applyTerminalTheme();
@@ -788,14 +799,10 @@ const App = () => {
 
   const loadProjectResults = async (project: ProjectNode) => {
     const previousTargetKey = selectedTargetKeyRef.current;
-    const shouldSyncLog = showTerminal && previousTargetKey !== null;
+    const shouldSyncLog = previousTargetKey !== null;
     activeProjectRef.current = project.id;
     setSelectedProject(project);
     setSelectedNodeId(project.id);
-    if (!showTerminal) {
-      setSelectedTargetKey(null);
-      selectedTargetKeyRef.current = null;
-    }
     const freshResults: Record<string, TargetSummary> = {};
     await Promise.all(
       project.targets.map(async (node) => {
@@ -856,10 +863,22 @@ const App = () => {
     }
     const nextKey =
       `${nextTarget.projectHash}/${nextTarget.target}/${nextTarget.targetHash}`;
+    if (showTerminal) {
+      await showTargetLog(nextKey, nextTarget, true);
+      return;
+    }
+    if (terminal.current) {
+      await loadTargetLog(nextKey, nextTarget, false);
+      return;
+    }
     await showTargetLog(nextKey, nextTarget, true);
   };
 
-  const loadTargetLog = async (key: string, target: GraphNode) => {
+  const loadTargetLog = async (
+    key: string,
+    target: GraphNode,
+    ensureExpanded: boolean = true
+  ) => {
     if (!terminal.current) {
       return;
     }
@@ -872,7 +891,9 @@ const App = () => {
     setSelectedTargetKey(key);
     selectedTargetKeyRef.current = key;
     terminal.current.reset();
-    setShowTerminal(true);
+    if (ensureExpanded) {
+      setShowTerminal(true);
+    }
     try {
       const response = await fetch(
         `/api/build/target-log/${target.projectHash}/${target.target}/${target.targetHash}`
@@ -1049,7 +1070,7 @@ const App = () => {
           minHeight: 0,
           display: "flex",
           flexDirection: "column",
-          gap: showTerminal ? theme.spacing.md : 0,
+          gap: theme.spacing.md,
         }}
       >
         <Box style={{ flex: 1, minHeight: 0 }}>
@@ -1082,12 +1103,7 @@ const App = () => {
           showTerminal={showTerminal}
           buildRunning={buildRunning}
           title={buildLogTitle}
-          onHide={() => {
-            setShowTerminal(false);
-            setSelectedTargetKey(null);
-            selectedTargetKeyRef.current = null;
-            setBuildEndedAt(null);
-          }}
+          onToggle={() => setShowTerminal((value) => !value)}
           terminalRef={terminalRef}
           background={terminalBackground}
         />
diff --git a/src/Terrabuild.UI/src/components/BuildLogPanel.tsx b/src/Terrabuild.UI/src/components/BuildLogPanel.tsx
index 3fdbc27d..4cceba96 100644
--- a/src/Terrabuild.UI/src/components/BuildLogPanel.tsx
+++ b/src/Terrabuild.UI/src/components/BuildLogPanel.tsx
@@ -1,13 +1,16 @@
 import { ActionIcon, Badge, Box, Group, Paper, Title } from "@mantine/core";
-import { IconSquareRoundedChevronDown } from "@tabler/icons-react";
-import { RefObject } from "react";
+import {
+  IconSquareRoundedChevronDown,
+  IconSquareRoundedChevronUp,
+} from "@tabler/icons-react";
+import { Ref } from "react";
 
 type BuildLogPanelProps = {
   showTerminal: boolean;
   buildRunning: boolean;
   title: string;
-  onHide: () => void;
-  terminalRef: RefObject<HTMLDivElement | null>;
+  onToggle: () => void;
+  terminalRef: Ref<HTMLDivElement>;
   background: string;
 };
 
@@ -15,49 +18,58 @@ const BuildLogPanel = ({
   showTerminal,
   buildRunning,
   title,
-  onHide,
+  onToggle,
   terminalRef,
   background,
 }: BuildLogPanelProps) => {
+  const collapsedHeight = 72;
   return (
     <Paper
-      withBorder={showTerminal}
-      shadow={showTerminal ? "md" : undefined}
+      withBorder
+      shadow={showTerminal ? "md" : "sm"}
       radius="md"
-      p={showTerminal ? "md" : 0}
+      p="md"
       style={{
-        height: showTerminal ? 280 : 0,
-        opacity: showTerminal ? 1 : 0,
+        height: showTerminal ? 280 : collapsedHeight,
         display: "flex",
         flexDirection: "column",
         overflow: "hidden",
-        transition: "height 200ms ease, opacity 200ms ease",
-        pointerEvents: showTerminal ? "auto" : "none",
+        transition: "height 200ms ease",
       }}
     >
-      {showTerminal && (
-        <Group justify="space-between" align="center" mb="sm">
-          <Title order={4}>{title}</Title>
-          <Group spacing="xs" align="center" justify="flex-end">
-            <Badge color={buildRunning ? "orange" : "gray"}>
-              {buildRunning ? "Live" : "Idle"}
-            </Badge>
-            <ActionIcon
-              size="lg"
-              variant="subtle"
-              onClick={onHide}
-              disabled={buildRunning}
-              aria-label="Hide terminal"
-            >
+      <Group justify="space-between" align="center" mb={showTerminal ? "sm" : 0}>
+        <Title order={4}>{title}</Title>
+        <Group align="center" justify="flex-end">
+          <Badge color={buildRunning ? "orange" : "gray"}>
+            {buildRunning ? "Live" : "Idle"}
+          </Badge>
+          <ActionIcon
+            size="lg"
+            variant="subtle"
+            onClick={onToggle}
+            aria-label={showTerminal ? "Collapse terminal" : "Expand terminal"}
+          >
+            {showTerminal ? (
               <IconSquareRoundedChevronDown size={18} />
-            </ActionIcon>
-          </Group>
+            ) : (
+              <IconSquareRoundedChevronUp size={18} />
+            )}
+          </ActionIcon>
         </Group>
-      )}
+      </Group>
       <Box
         className="terminal-body"
         ref={terminalRef}
-        style={{ background }}
+        style={{
+          background,
+          flexGrow: showTerminal ? 1 : 0,
+          flexBasis: showTerminal ? "auto" : 0,
+          minHeight: 0,
+          maxHeight: showTerminal ? "none" : 0,
+          opacity: showTerminal ? 1 : 0,
+          pointerEvents: showTerminal ? "auto" : "none",
+          transition: "opacity 200ms ease",
+        }}
       />
     </Paper>
   );