diff --git a/package.json b/package.json
index 1a8d9f5..354cfb2 100644
--- a/package.json
+++ b/package.json
@@ -5,12 +5,15 @@
   "scripts": {
     "build": "bun run build:vite && bun run build:compile",
     "build:compile": "bun build.ts",
+    "build:tauri": "tauri build",
     "build:vite": "vite build",
     "db:generate": "drizzle-kit generate",
     "db:migrate": "drizzle-kit migrate",
     "db:push": "drizzle-kit push",
     "db:studio": "drizzle-kit studio",
-    "dev": "vite dev",
+    "dev": "bun run dev:vite",
+    "dev:tauri": "tauri dev",
+    "dev:vite": "vite dev",
     "fix": "biome check --write",
     "typecheck": "tsc -b"
   },
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 2bd178b..3d47828 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -3,6 +3,11 @@
   "productName": "tauri-shell",
   "version": "0.1.0",
   "identifier": "com.imbytecat.tauri-shell",
+  "build": {
+    "beforeDevCommand": "bun run dev:vite",
+    "devUrl": "http://localhost:3000",
+    "beforeBuildCommand": "bun run build"
+  },
   "app": {
     "withGlobalTauri": true,
     "windows": [],
@@ -20,8 +25,6 @@
       "icons/icon.icns",
       "icons/icon.ico"
     ],
-    "externalBin": [
-      "binaries/server"
-    ]
+    "externalBin": ["binaries/server"]
   }
 }
diff --git a/vite.config.ts b/vite.config.ts
index 7fd078e..8a2947d 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -23,4 +23,11 @@ export default defineConfig({
       },
     }),
   ],
+  server: {
+    port: 3000,
+    strictPort: true,
+    watch: {
+      ignored: ['**/src-tauri/**'],
+    },
+  },
 })