diff --git a/scripts/patches/bazel_intellij_aspect_filter.patch b/scripts/patches/bazel_intellij_aspect_filter.patch
index a9056f1..940c383 100644
--- a/scripts/patches/bazel_intellij_aspect_filter.patch
+++ b/scripts/patches/bazel_intellij_aspect_filter.patch
@@ -24,7 +24,7 @@
 #
 --- a/intellij_info_impl.bzl.o
 +++ b/intellij_info_impl.bzl
-@@ -312,7 +312,7 @@
+@@ -312,7 +312,7 @@ def _collect_generated_proto_go_sources(target):
          files = target[OutputGroupInfo].go_generated_srcs.to_list()
      else:
          return None
@@ -33,7 +33,16 @@
 
  def collect_go_info(target, ctx, semantics, ide_info, ide_info_file, output_groups):
      """Updates Go-specific output groups, returns false if not a recognized Go target."""
-@@ -897,10 +897,14 @@
+@@ -329,6 +329,8 @@ def collect_go_info(target, ctx, semantics, ide_info, ide_info_file, output_grou
+         "go_appengine_test",
+     ]:
+         sources = [f for src in getattr(ctx.rule.attr, "srcs", []) for f in src.files.to_list()]
++        sources += [f for embed in getattr(ctx.rule.attr, "embed", []) for f in _collect_generated_proto_go_sources(embed) or []]
++
+         generated = [f for f in sources if not f.is_source]
+     elif ctx.rule.kind == "go_wrap_cc":
+         genfiles = target.files.to_list()
+@@ -897,10 +899,14 @@ def intellij_info_aspect_impl(target, ctx, semantics):
      file_name = file_name + ".intellij-info.txt"
      ide_info_file = ctx.actions.declare_file(file_name)
 
@@ -49,7 +58,7 @@
          deps = list(all_deps),
          build_file_artifact_location = build_file_artifact_location(ctx),
          tags = tags,
-@@ -937,7 +942,7 @@
+@@ -937,7 +943,7 @@ def intellij_info_aspect_impl(target, ctx, semantics):
          output_groups = output_groups,
          intellij_info = struct(
              target_key = target_key,
