diff --git a/zshenv b/zshenv
index 38d233b..97fda03 100644
--- a/zshenv
+++ b/zshenv
@@ -17,6 +17,12 @@ if (( $+commands[ruby] )); then
   [[ -d "$gem_bin_path" ]] && path+=("$gem_bin_path")
 fi
 
+# Setup go paths
+if (( $+commands[go] )); then
+  local go_bin_path="$(go env GOPATH)/bin"
+  [[ -d "$go_bin_path" ]] && path+=("$go_bin_path")
+fi
+
 if (( $+commands[fd] )); then
   export FZF_DEFAULT_COMMAND="fd --type f"
   export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"