diff --git a/apps/code/src/renderer/features/sessions/components/session-update/ExecuteToolView.tsx b/apps/code/src/renderer/features/sessions/components/session-update/ExecuteToolView.tsx
index a0a80930a..c48d024e8 100644
--- a/apps/code/src/renderer/features/sessions/components/session-update/ExecuteToolView.tsx
+++ b/apps/code/src/renderer/features/sessions/components/session-update/ExecuteToolView.tsx
@@ -51,11 +51,12 @@ export function ExecuteToolView({
   };
 
   return (
-    <Box
-      className={`group py-0.5 ${isExpandable ? "cursor-pointer" : ""}`}
-      onClick={handleClick}
-    >
-      <Flex gap="2" className="min-w-0">
+    <Box className="py-0.5">
+      <Flex
+        gap="2"
+        className={`group min-w-0 ${isExpandable ? "cursor-pointer" : ""}`}
+        onClick={handleClick}
+      >
         <Box className="shrink-0 pt-px">
           <ExpandableIcon
             icon={Terminal}
diff --git a/apps/code/src/renderer/features/sessions/components/session-update/ToolCallView.tsx b/apps/code/src/renderer/features/sessions/components/session-update/ToolCallView.tsx
index 86f30c411..259aa193f 100644
--- a/apps/code/src/renderer/features/sessions/components/session-update/ToolCallView.tsx
+++ b/apps/code/src/renderer/features/sessions/components/session-update/ToolCallView.tsx
@@ -94,11 +94,12 @@ export function ToolCallView({
   };
 
   return (
-    <Box
-      className={`group py-0.5 ${isExpandable ? "cursor-pointer" : ""}`}
-      onClick={handleClick}
-    >
-      <Flex gap="2" className="min-w-0">
+    <Box className="py-0.5">
+      <Flex
+        gap="2"
+        className={`group min-w-0 ${isExpandable ? "cursor-pointer" : ""}`}
+        onClick={handleClick}
+      >
         <Box className="shrink-0 pt-px">
           <ExpandableIcon
             icon={KindIcon}