diff --git a/.github/workflows/pr_checks.yaml b/.github/workflows/pr_checks.yaml
index 56920694f..eec79f4c6 100644
--- a/.github/workflows/pr_checks.yaml
+++ b/.github/workflows/pr_checks.yaml
@@ -235,10 +235,11 @@ jobs:
           cd packages/config-yaml
           npm run build
 
-      - name: Type check
+      - name: Type check and lint
         run: |
           cd gui
           npx tsc --noEmit
+          npm run lint
 
   binary-checks:
     needs: [install-root, install-core, install-config-yaml]
diff --git a/gui/.eslintrc.json b/gui/.eslintrc.json
index 462fd5592..aebab49dd 100644
--- a/gui/.eslintrc.json
+++ b/gui/.eslintrc.json
@@ -3,7 +3,7 @@
   "parser": "@typescript-eslint/parser",
   "plugins": ["@typescript-eslint", "eslint-plugin-react"],
   "parserOptions": {
-    "project": "gui/tsconfig.json"
+    "project": ["tsconfig.json", "tsconfig.node.json"]
   },
   "extends": [
     // "eslint:recommended",
diff --git a/gui/package.json b/gui/package.json
index 4710796ea..de6da1959 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -12,7 +12,8 @@
     "test": "vitest run",
     "test:coverage": "vitest run --coverage",
     "test:ui": "vitest --ui",
-    "test:watch": "vitest"
+    "test:watch": "vitest",
+    "lint": "eslint --ext ts"
   },
   "dependencies": {
     "@continuedev/config-yaml": "file:../packages/config-yaml",