diff --git a/_bin/rtpctl.d b/_bin/rtpctl.d
index 7f79547..2b8af50 100755
--- a/_bin/rtpctl.d
+++ b/_bin/rtpctl.d
@@ -346,12 +346,12 @@ case "${1}" in
         ln -s $2 "$(cd -- "${SCRIPT_DIR}" && pwd)/${BASE_NAME}" "${3:-$HOME/.local/bin/}"
         ;;
     editme)
-        ${VISUAL:-${EDITOR:-vi}} "$(readlink -f "$0")"
+        exec ${VISUAL:-${EDITOR:-vi}} "$(readlink -f "$0")"
         ;;
     git)
         GIT_ARGS="$( printf '"%s" ' "${@:2}" )"
         [ "$GIT_ARGS" != '"update" ' ] || GIT_ARGS="pull --rebase --autostash"
-        exec sh -c 'cd user-config && git '"${GIT_ARGS}"'; exit $?'
+        exec sh -c "cd user-config && git ${GIT_ARGS}; exit \$?"
         ;;
     _load)
         echo "alias ${BASE_NAME}cd='cd \"$SCRIPT_DIR/..\"'"