diff --git a/cros_workon b/cros_workon
index 9632ea6f92..d991356c55 100755
--- a/cros_workon
+++ b/cros_workon
@@ -31,7 +31,7 @@ commands:
   list:  List of live ebuilds (workon ebuilds if --all)
   list-all:  List all of the live ebuilds for all setup boards
   iterate:  For each ebuild, cd to the source dir and run a commond"
-FLAGS "$@" || exit 1
+FLAGS "$@" || { [ "${FLAGS_help}" = "${FLAGS_TRUE}" ]  && exit 0; } || exit 1
 eval set -- "${FLAGS_ARGV}"