diff --git a/plugin/resolvergen/resolver.go b/plugin/resolvergen/resolver.go
index c090c1b30a5..065ecfb5e2a 100644
--- a/plugin/resolvergen/resolver.go
+++ b/plugin/resolvergen/resolver.go
@@ -159,6 +159,7 @@ func (m *Plugin) generatePerSchema(data *codegen.Data) error {
 				continue
 			}
 			structName := templates.LcFirst(o.Name) + templates.UcFirst(data.Config.Resolver.Type)
+			// TODO(steve): Why do we need to trimLeft "\" here? Some bazel thing?
 			comment := strings.TrimSpace(strings.TrimLeft(rewriter.GetMethodComment(structName, f.GoFieldName), `\`))
 			implementation := strings.TrimSpace(rewriter.GetMethodBody(structName, f.GoFieldName))
 			resolver := Resolver{o, f, rewriter.GetPrevDecl(structName, f.GoFieldName), comment, implementation, nil}
diff --git a/plugin/resolvergen/resolver.gotpl b/plugin/resolvergen/resolver.gotpl
index ad6c1085819..bede575ab15 100644
--- a/plugin/resolvergen/resolver.gotpl
+++ b/plugin/resolvergen/resolver.gotpl
@@ -20,7 +20,7 @@
 
 {{ range $resolver := .Resolvers -}}
 	{{ if $resolver.Comment -}}
-		// {{ $resolver.Comment }}
+		{{with $resolver.Comment}}{{.|prefixLines "// "}}{{end}}
 	{{- else if not $.OmitTemplateComment -}}
 		// {{ $resolver.Field.GoFieldName }} is the resolver for the {{ $resolver.Field.Name }} field.
 	{{- end }}
diff --git a/plugin/resolvergen/testdata/followschema/out/schema.resolvers.go b/plugin/resolvergen/testdata/followschema/out/schema.resolvers.go
index 27661bed710..f74bdef88a4 100644
--- a/plugin/resolvergen/testdata/followschema/out/schema.resolvers.go
+++ b/plugin/resolvergen/testdata/followschema/out/schema.resolvers.go
@@ -17,6 +17,7 @@ func (r *queryCustomResolverType) Resolver(ctx context.Context) (_ *customresolv
 }
 
 // Name is the resolver for the name field.
+// This comment is multiline method doc
 func (r *resolverCustomResolverType) Name(ctx context.Context, obj *customresolver.Resolver) (string, error) {
 	// CustomerResolverType.Name implementation
 	return "", nil
@@ -26,6 +27,7 @@ func (r *resolverCustomResolverType) Name(ctx context.Context, obj *customresolv
 func (r *CustomResolverType) Query() customresolver.QueryResolver { return &queryCustomResolverType{r} }
 
 // Resolver returns customresolver.ResolverResolver implementation.
+// This comment is multiline method doc
 func (r *CustomResolverType) Resolver() customresolver.ResolverResolver {
 	return &resolverCustomResolverType{r}
 }
diff --git a/plugin/resolvergen/testdata/followschema/out/schema.resolvers.go.txt b/plugin/resolvergen/testdata/followschema/out/schema.resolvers.go.txt
index 27661bed710..f74bdef88a4 100644
--- a/plugin/resolvergen/testdata/followschema/out/schema.resolvers.go.txt
+++ b/plugin/resolvergen/testdata/followschema/out/schema.resolvers.go.txt
@@ -17,6 +17,7 @@ func (r *queryCustomResolverType) Resolver(ctx context.Context) (_ *customresolv
 }
 
 // Name is the resolver for the name field.
+// This comment is multiline method doc
 func (r *resolverCustomResolverType) Name(ctx context.Context, obj *customresolver.Resolver) (string, error) {
 	// CustomerResolverType.Name implementation
 	return "", nil
@@ -26,6 +27,7 @@ func (r *resolverCustomResolverType) Name(ctx context.Context, obj *customresolv
 func (r *CustomResolverType) Query() customresolver.QueryResolver { return &queryCustomResolverType{r} }
 
 // Resolver returns customresolver.ResolverResolver implementation.
+// This comment is multiline method doc
 func (r *CustomResolverType) Resolver() customresolver.ResolverResolver {
 	return &resolverCustomResolverType{r}
 }
diff --git a/plugin/resolvergen/testdata/resolvertemplate/customResolverTemplate.gotpl b/plugin/resolvergen/testdata/resolvertemplate/customResolverTemplate.gotpl
index ff652f01480..71d69e87004 100644
--- a/plugin/resolvergen/testdata/resolvertemplate/customResolverTemplate.gotpl
+++ b/plugin/resolvergen/testdata/resolvertemplate/customResolverTemplate.gotpl
@@ -21,7 +21,7 @@
 
 {{ range $resolver := .Resolvers -}}
 	{{ if $resolver.Comment -}}
-		// {{ $resolver.Comment }}
+		{{with $resolver.Comment}}{{.|prefixLines "// "}}{{end}}
 	{{- else if not $.OmitTemplateComment -}}
 		// {{ $resolver.Field.GoFieldName }} is the resolver for the {{ $resolver.Field.Name }} field.
 	{{- end }}