diff --git a/client/src/components/ToolsTab.tsx b/client/src/components/ToolsTab.tsx
index 79cdac3d..04d298e1 100644
--- a/client/src/components/ToolsTab.tsx
+++ b/client/src/components/ToolsTab.tsx
@@ -472,6 +472,9 @@ const ToolsTab = ({
                   )}
                 <Button
                   onClick={async () => {
+                    // Validate JSON inputs before calling tool
+                    if (checkValidationErrors()) return;
+
                     try {
                       setIsToolRunning(true);
                       const meta = metaEntries.reduce<Record<string, unknown>>(
@@ -490,7 +493,7 @@ const ToolsTab = ({
                       setIsToolRunning(false);
                     }
                   }}
-                  disabled={isToolRunning}
+                  disabled={isToolRunning || hasValidationErrors}
                 >
                   {isToolRunning ? (
                     <>
@@ -505,32 +508,6 @@ const ToolsTab = ({
                   )}
                 </Button>
                 <div className="flex gap-2">
-                  <Button
-                    onClick={async () => {
-                      // Validate JSON inputs before calling tool
-                      if (checkValidationErrors()) return;
-
-                      try {
-                        setIsToolRunning(true);
-                        await callTool(selectedTool.name, params);
-                      } finally {
-                        setIsToolRunning(false);
-                      }
-                    }}
-                    disabled={isToolRunning || hasValidationErrors}
-                  >
-                    {isToolRunning ? (
-                      <>
-                        <Loader2 className="w-4 h-4 mr-2 animate-spin" />
-                        Running...
-                      </>
-                    ) : (
-                      <>
-                        <Send className="w-4 h-4 mr-2" />
-                        Run Tool
-                      </>
-                    )}
-                  </Button>
                   <Button
                     onClick={async () => {
                       try {
diff --git a/client/src/components/__tests__/ToolsTab.test.tsx b/client/src/components/__tests__/ToolsTab.test.tsx
index 0f41bbdd..7a76ce20 100644
--- a/client/src/components/__tests__/ToolsTab.test.tsx
+++ b/client/src/components/__tests__/ToolsTab.test.tsx
@@ -835,6 +835,7 @@ describe("ToolsTab", () => {
           message: "test message",
           count: 5,
         },
+        undefined,
       );
     });