diff --git a/base/src/com/google/idea/blaze/base/build/BlazeBuildService.java b/base/src/com/google/idea/blaze/base/build/BlazeBuildService.java
index a62ea7fece4..8103ff1a090 100644
--- a/base/src/com/google/idea/blaze/base/build/BlazeBuildService.java
+++ b/base/src/com/google/idea/blaze/base/build/BlazeBuildService.java
@@ -143,24 +143,21 @@ public void buildFiles(Collection<? extends VirtualFile> files) {
       pathsToQuery.add(path);
     }
 
-    ScopedFunction<List<TargetExpression>> targets =
-        context ->
-            BlazeQuerySourceToTargetProvider.getTargetsBuildingSourceFiles(
-                  project, pathsToQuery.build(), context, BlazeInvocationContext.ContextType.Other
-            ).stream().map(t -> t.label).collect(toImmutableList());
-
     buildTargetExpressions(
             project,
             projectView,
             projectData,
-            targets,
+            context ->
+                BlazeQuerySourceToTargetProvider.getTargetsBuildingSourceFiles(
+                        project, pathsToQuery.build(), context, BlazeInvocationContext.ContextType.Sync
+                ).stream().map(t -> t.label).collect(toImmutableList()),
             new NotificationScope(
                     project,
                     "Make",
-                    "Make project",
-                    "Make project completed successfully",
-                    "Make project failed"),
-            "Make project",
+                    "Make files",
+                    "Make files completed successfully",
+                    "Make files failed"),
+            "Make files",
             buildSystem);
 
     // In case the user touched a file, but didn't change its content. The user will get a false