diff --git a/flag.go b/flag.go
index 107fa190..2b21b6f1 100644
--- a/flag.go
+++ b/flag.go
@@ -1173,6 +1173,9 @@ func (f *FlagSet) Parse(arguments []string) error {
 		case ContinueOnError:
 			return err
 		case ExitOnError:
+			if err == ErrHelp {
+				os.Exit(0)
+			}
 			fmt.Fprintln(f.Output(), err)
 			os.Exit(2)
 		case PanicOnError: