diff --git a/.github/workflows/javascript-formatting.yml b/.github/workflows/javascript-formatting.yml
index c15e2ce5f..be7da5e0f 100644
--- a/.github/workflows/javascript-formatting.yml
+++ b/.github/workflows/javascript-formatting.yml
@@ -1,30 +1,42 @@
-name: Format Javascript
+name: Format+Lint Javascript
 
 # This action works with pull requests and pushes
 on:
   push:
-    branches:
-    - develop
-
+    paths:
+      - web/**
 jobs:
   prettier:
     runs-on: ubuntu-latest
     if: ${{ github.actor != 'dependabot[bot]' }}
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        # Make sure the actual branch is checked out when running on pull requests
-        ref: ${{ github.head_ref }}
-        fetch-depth: 0
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          # Make sure the actual branch is checked out when running on pull requests
+          ref: ${{ github.head_ref }}
+          fetch-depth: 0
 
-    - name: Prettify code
-      uses: creyD/prettier_action@v4.2
-      with:
-        # This part is also where you can pass other options, for example:
-        prettier_options: --write web/**/*.{js,ts,jsx,tsx,css,md}
-        working_directory: web
-        only_changed: true
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Prettify code
+        uses: creyD/prettier_action@v4.2
+        with:
+          # This part is also where you can pass other options, for example:
+          prettier_options: --write **/*.{js,ts,jsx,tsx,css,md}
+          working_directory: web
+          only_changed: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  linter:
+    runs-on: ubuntu-latest
+    name: Run linter on changed files
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install Dependencies
+        run: npm install
+
+      - name: Lint
+        run: npm run lint