diff --git a/electron/main.js b/electron/main.js
index 130d5f4..8971822 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -319,6 +319,17 @@ function setupWebSocket() {
   });
 }
 
+function getPortFromArgs() {
+  const portArg = process.argv.find(arg => arg.startsWith('--port='));
+  if (portArg) {
+    const port = parseInt(portArg.split('=')[1], 10);
+    if (!isNaN(port) && port > 0 && port < 65536) {
+      return port;
+    }
+  }
+  return null;
+}
+
 async function startServer() {
   const app = express();
   const fs = await import('fs');
@@ -356,7 +367,7 @@ async function startServer() {
 
   setupWebSocket();
 
-  const startPort = parseInt(process.env.PORT || '3002', 10);
+  const startPort = getPortFromArgs() || parseInt(process.env.PORT || '3002', 10);
   const availablePort = await findAvailablePort(startPort);
 
   server.listen(availablePort, () => {