diff --git a/client/src/components/Sidebar.tsx b/client/src/components/Sidebar.tsx
index a41e4bfc..4691c99c 100644
--- a/client/src/components/Sidebar.tsx
+++ b/client/src/components/Sidebar.tsx
@@ -268,6 +268,7 @@ const Sidebar = ({
                   placeholder="Command"
                   value={command}
                   onChange={(e) => setCommand(e.target.value)}
+                  onBlur={(e) => setCommand(e.target.value.trim())}
                   className="font-mono"
                 />
               </div>
diff --git a/client/src/components/__tests__/Sidebar.test.tsx b/client/src/components/__tests__/Sidebar.test.tsx
index e892a7f8..b4dcb684 100644
--- a/client/src/components/__tests__/Sidebar.test.tsx
+++ b/client/src/components/__tests__/Sidebar.test.tsx
@@ -878,4 +878,36 @@ describe("Sidebar Environment Variables", () => {
       expect(mockClipboardWrite).toHaveBeenCalledWith(expectedConfig);
     });
   });
+
+  describe("Command and arguments", () => {
+    it("should trim whitespace from command input on blur", () => {
+      const setCommand = jest.fn();
+      renderSidebar({ command: "  node server.js  ", setCommand });
+
+      const commandInput = screen.getByLabelText("Command");
+
+      fireEvent.blur(commandInput);
+      expect(setCommand).toHaveBeenLastCalledWith("node server.js");
+    });
+
+    it("should handle whitespace-only command input on blur", () => {
+      const setCommand = jest.fn();
+      renderSidebar({ command: "   ", setCommand });
+
+      const commandInput = screen.getByLabelText("Command");
+
+      fireEvent.blur(commandInput);
+      expect(setCommand).toHaveBeenLastCalledWith("");
+    });
+
+    it("should not affect command without surrounding whitespace", () => {
+      const setCommand = jest.fn();
+      renderSidebar({ command: "node", setCommand });
+
+      const commandInput = screen.getByLabelText("Command");
+
+      fireEvent.blur(commandInput);
+      expect(setCommand).toHaveBeenLastCalledWith("node");
+    });
+  });
 });