diff --git a/help_test.go b/help_test.go
index de8e2f0cd9..37410a5449 100644
--- a/help_test.go
+++ b/help_test.go
@@ -1367,7 +1367,7 @@ DESCRIPTION:
 
 OPTIONS:
    --help, -h  show help (default: false)
-   `
+`
 
 	if output.String() != expected {
 		t.Errorf("Unexpected wrapping, got:\n%s\nexpected:\n%s",
@@ -1436,7 +1436,7 @@ USAGE:
 
 OPTIONS:
    --help, -h  show help (default: false)
-   `
+`
 
 	if output.String() != expected {
 		t.Errorf("Unexpected wrapping, got:\n%s\nexpected: %s",
@@ -1512,7 +1512,7 @@ USAGE:
 OPTIONS:
    --help, -h      show help (default: false)
    --test-f value  my test usage
-   `
+`
 
 	if output.String() != expected {
 		t.Errorf("Unexpected wrapping, got:\n%s\nexpected: %s",
diff --git a/template.go b/template.go
index f48e5099f3..1133b8907c 100644
--- a/template.go
+++ b/template.go
@@ -13,8 +13,10 @@ var visibleCommandCategoryTemplate = `{{range .VisibleCategories}}{{if .Name}}
      {{join .Names ", "}}{{"\t"}}{{.Usage}}{{end}}{{else}}{{template "visibleCommandTemplate" .}}{{end}}{{end}}`
 var visibleFlagCategoryTemplate = `{{range .VisibleFlagCategories}}
    {{if .Name}}{{.Name}}
-   {{end}}{{range .Flags}}{{.}}
-   {{end}}{{end}}`
+
+   {{end}}{{$flglen := len .Flags}}{{range $i, $e := .Flags}}{{if eq (subtract $flglen $i) 1}}{{$e}}
+{{else}}{{$e}}
+   {{end}}{{end}}{{end}}`
 
 var visibleFlagTemplate = `{{range $index, $option := .VisibleFlags}}{{if $index}}{{end}}
    {{wrap $option.String 6}}{{end}}`