diff --git a/.bashrc b/.bashrc
index 820cbcf..adaf2b7 100644
--- a/.bashrc
+++ b/.bashrc
@@ -4,7 +4,7 @@ export HISTFILESIZE=-1
 
 test -s ~/.alias && . ~/.alias || true
 export PATH=~/.local/bin:"$PATH"
-[[ -d ~/go/bin ]] && export PATH="$PATH":$HOME/go/bin
+type go >/dev/null 2>&1 && export GOPATH=$(go env GOPATH) && export PATH="$PATH":$GOPATH/bin
 
 # needed for pw function and gnupg.vim
 GPG_TTY=$(tty)
@@ -25,7 +25,6 @@ fi
 # Go Bullet Train settings
 [[ -f "$HOME/go/bin/gbt" ]] && [[ -f "$HOME/.gbt.sh" ]] && source "$HOME/.gbt.sh"
 
-type go >/dev/null 2>&1 && export GOPATH=$(go env GOPATH)
 
 [[ -f "$HOME/.functions.sh" ]] && source ~/.functions.sh
 [[ -f "$HOME/Develop/sps/completion.sh" ]] && source ~/Develop/sps/completion.sh