diff --git a/bin/omarchy-windows-vm b/bin/omarchy-windows-vm
index 2a2cf887..a9fa8d2f 100755
--- a/bin/omarchy-windows-vm
+++ b/bin/omarchy-windows-vm
@@ -199,7 +199,7 @@ services:
     volumes:
       - $HOME/.windows:/storage
       - $HOME/Windows:/shared
-    restart: unless-stopped
+    restart: "no"
     stop_grace_period: 2m
 EOF
 
diff --git a/test/shell.d/windows-vm-test.sh b/test/shell.d/windows-vm-test.sh
new file mode 100644
index 00000000..2e887672
--- /dev/null
+++ b/test/shell.d/windows-vm-test.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
+
+windows_vm_command="$ROOT/bin/omarchy-windows-vm"
+
+rg -q '^    restart: "no"$' "$windows_vm_command" ||
+  fail "Windows VM uses manual startup by default"
+pass "Windows VM uses manual startup by default"
+
+if rg -q '^    restart: unless-stopped$' "$windows_vm_command"; then
+  fail "Windows VM does not restart automatically at boot"
+fi
+pass "Windows VM does not restart automatically at boot"