diff --git a/Justfile b/Justfile
index 56045d0b8..efbab4131 100644
--- a/Justfile
+++ b/Justfile
@@ -1,7 +1,12 @@
 import 'c.just'
 alias build-rust-debug := build-rust
 
-set windows-shell := ["pwsh.exe", "-NoLogo", "-Command"]
+set windows-shell := [
+  "pwsh.exe",
+  "-NoLogo",
+  "-Command",
+  " & { $cmd = $args -join ' '; Invoke-Expression $cmd; if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } }"
+]
 set dotenv-load := true
 
 set-trace-env-vars := if os() == "windows" { "$env:RUST_LOG='none,hyperlight-host=info';" } else { "RUST_LOG=none,hyperlight-host=info" }