diff --git a/archbox.bash b/archbox.bash
index b980f85..0b4bff2 100755
--- a/archbox.bash
+++ b/archbox.bash
@@ -100,7 +100,6 @@ case $1 in
     *)
 	storeenv
     	copyresolv
-        COMMAND=$(echo $@ | tr ' ' '\ ')
-	$PRIV /usr/local/share/archbox/bin/archbox $COMMAND
+	$PRIV /usr/local/share/archbox/bin/archbox $@
     ;;
 esac
diff --git a/archboxcommand.bash b/archboxcommand.bash
index 7417928..0b99948 100755
--- a/archboxcommand.bash
+++ b/archboxcommand.bash
@@ -5,7 +5,6 @@ source /etc/archbox.conf
 REQ_ENV="DBUS_SESSION_BUS_ADDRESS=$(cat /tmp/archbox_dbus_session_address) XDG_RUNTIME_DIR=$(cat /tmp/archbox_xdg_runtime_dir)"
 
 ENV="$REQ_ENV $ENV_VAR"
-
-COMMAND=$(echo $@ | tr ' ' '\ ')
+COMMAND="$@"
 [[ $1 = "enter" ]] && (chroot $CHROOT /sbin/env $ENV /bin/su $USER; exit 0) \
     || chroot $CHROOT /bin/su -c "env $ENV $COMMAND" $USER