diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index cdeec5200..4c78f264e 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -143,9 +143,11 @@ jobs:
         run: pnpm config set auto-install-peers false
       - name: Install all dependencies and symlink for ep_etherpad-lite
         run: ./bin/installDeps.sh
+        shell: msys2 {0}
         working-directory: etherpad/src
       -
         name: Run Etherpad
+        shell: msys2 {0}
         working-directory: etherpad/src
         run: |
           pnpm run prod
diff --git a/src/bin/installOnWindows.bat b/src/bin/installOnWindows.bat
index acc8d4982..56bd4c7de 100644
--- a/src/bin/installOnWindows.bat
+++ b/src/bin/installOnWindows.bat
@@ -13,7 +13,7 @@ mkdir node_modules
 cd /D node_modules
 mklink /D "ep_etherpad-lite" "..\src"
 
-cd /D "ep_etherpad-lite"
+cd /D ..\src
 cmd /C pnpm i || exit /B 1
 
 cd /D "%~dp0\..\.."
diff --git a/start.bat b/start.bat
index 5fce6ca69..bf8f1b23d 100644
--- a/start.bat
+++ b/start.bat
@@ -8,4 +8,5 @@ REM around this, everything must consistently use either `src` or
 REM `node_modules\ep_etherpad-lite` on Windows. Because some plugins access
 REM Etherpad internals via `require('ep_etherpad-lite/foo')`,
 REM `node_modules\ep_etherpad-lite` is used here.
-node run dev
+cd src
+pnpm run prod