diff --git a/bin/qemush b/bin/qemush
index 7dca2db..bcedfc3 100755
--- a/bin/qemush
+++ b/bin/qemush
@@ -7,15 +7,13 @@ exec_as() {
 
     if [ "$(whoami)" != "$user" ]; then
         exec sudo -u "$user" "$0" "$@"
-    else
-        cd || exit
     fi
 }
 
 exec_as qemu "$@"
 
 bin="${HOME}/bin"
-images=images
+images="${HOME}/images"
 PATH="${bin}:${PATH}"
 EDITOR="${EDITOR:-nvim}"
 alias ls='ls --color=auto'
@@ -106,6 +104,7 @@ public_rm() {
 }
 
 public_shell() {
+    cd || return
     exec bash -i
 }
 
@@ -116,7 +115,6 @@ public_cat() {
 public_add() {
     trap return EXIT
     set -e
-    cd -
     local name="${2:-$(basename "$1")}"
     cp -v -i -- "$1" "${bin}/${2}"
     chmod 740 "${bin}/${name}"