diff --git a/qubes-rpc/qvm-run-vm b/qubes-rpc/qvm-run-vm
index 1dbbe44..710d2bb 100755
--- a/qubes-rpc/qvm-run-vm
+++ b/qubes-rpc/qvm-run-vm
@@ -49,4 +49,10 @@ elif [ "$VMNAME" = "" ] ; then
     print_usage
     exit 1
 fi
-exec /usr/lib/qubes/qrexec-client-vm "$VMNAME" qubes.VMShell "/usr/lib/qubes/qrun-in-vm" "$@"
+
+service="qubes.VMShell"
+case "$VMNAME" in \$dispvm|\$dispvm:*)
+    service="$service+WaitForSession"
+esac
+
+exec /usr/lib/qubes/qrexec-client-vm "$VMNAME" "$service" "/usr/lib/qubes/qrun-in-vm" "$@"