diff --git a/plugins/available/goenv.plugin.bash b/plugins/available/goenv.plugin.bash
index 584365b7..ecc1b1c2 100644
--- a/plugins/available/goenv.plugin.bash
+++ b/plugins/available/goenv.plugin.bash
@@ -3,8 +3,10 @@ about-plugin 'load goenv, if you are using it'
 
 # Don't modify the environment if we can't find the tool:
 # - Check if in $PATH already
+# - Check if installed manually to $GOENV_ROOT
 # - Check if installed manually to $HOME
 _command_exists goenv ||
+  [[ -n "$GOENV_ROOT" && -x "$GOENV_ROOT/bin/goenv" ]] ||
   [[ -x "$HOME/.goenv/bin/goenv" ]] ||
   return
 
@@ -12,7 +14,7 @@ _command_exists goenv ||
 export GOENV_ROOT="${GOENV_ROOT:-$HOME/.goenv}"
 
 # Add GOENV_ROOT/bin to PATH, if that's where it's installed
-[[ -x "$HOME/.goenv/bin/goenv" ]] && pathmunge "$GOENV_ROOT/bin"
+! _command_exists goenv && [[ -x "$GOENV_ROOT/bin/goenv" ]] && pathmunge "$GOENV_ROOT/bin"
 
 # Initialize goenv
 eval "$(goenv init - bash)"