diff --git a/src/client/app.tsx b/src/client/app.tsx
index 4c40467..6a65522 100644
--- a/src/client/app.tsx
+++ b/src/client/app.tsx
@@ -30,7 +30,12 @@ export function App() {
     if (!filters.searchQuery) return [];
     const lq = filters.searchQuery.toLowerCase();
     return filteredMessages.reduce<number[]>((acc, msg, i) => {
-      if (msg.content.toLowerCase().includes(lq)) acc.push(i);
+      if (
+        msg.content.toLowerCase().includes(lq) ||
+        (msg.toolInput && msg.toolInput.toLowerCase().includes(lq))
+      ) {
+        acc.push(i);
+      }
       return acc;
     }, []);
   }, [filteredMessages, filters.searchQuery]);
diff --git a/src/client/components/SessionViewer.tsx b/src/client/components/SessionViewer.tsx
index c47fde4..716d52a 100644
--- a/src/client/components/SessionViewer.tsx
+++ b/src/client/components/SessionViewer.tsx
@@ -197,9 +197,11 @@ export function SessionViewer({
             );
           }
           const msg = item.message;
+          const lq = searchQuery ? searchQuery.toLowerCase() : "";
           const isMatch =
             searchQuery &&
-            msg.content.toLowerCase().includes(searchQuery.toLowerCase());
+            (msg.content.toLowerCase().includes(lq) ||
+              (msg.toolInput && msg.toolInput.toLowerCase().includes(lq)));
           const isDimmed = searchQuery && !isMatch;
           const isFocused = item.messageIndex === focusedIndex;
           return (