diff --git a/run/run.sh b/run/run.sh
index 2b7080d..3946cb5 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -52,7 +52,5 @@ set -m
 )
 set +m
 
-# Since we started the QEMU process with -m, we need to poll if it's still running
-while s=`ps -p "$(cat ${_QEMU_PID})" -o s=` && [[ "$s" && "$s" != 'Z' ]]; do
-  sleep 1
-done
+pidwait -F "${_QEMU_PID}" &
+wait $!