diff --git a/qubes-rpc/qvm-run b/qubes-rpc/qvm-run
index 0997e61..5bc50e3 100755
--- a/qubes-rpc/qvm-run
+++ b/qubes-rpc/qvm-run
@@ -40,10 +40,10 @@ if [ $# -lt 2 ] ; then
     exit 1
 fi
 
-VMNAME=$1
+VMNAME="$1"
 shift
 
-if [ $VMNAME = "--dispvm" ] ; then
+if [ "$VMNAME" = "--dispvm" ] ; then
     VMNAME='$dispvm'
 fi
-exec /usr/lib/qubes/qrexec-client-vm $VMNAME qubes.VMShell "/usr/lib/qubes/qrun-in-vm" "$@"
+exec /usr/lib/qubes/qrexec-client-vm "$VMNAME" qubes.VMShell "/usr/lib/qubes/qrun-in-vm" "$@"